ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CommonHostInterface: Wrap OSD messages

This commit is contained in:
Connor McLaughlin 2021-01-25 01:05:21 +10:00
parent b3ce2b21c0
commit 6eeca57a06
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend-common/common_host_interface.cpp
View File

@ -932,6 +932,7 @@ void CommonHostInterface::DrawOSDMessages()
return; return;
const float scale = ImGui::GetIO().DisplayFramebufferScale.x; const float scale = ImGui::GetIO().DisplayFramebufferScale.x;
const float max_width = ImGui::GetIO().DisplaySize.x - (20.0f * scale);
auto iter = m_osd_messages.begin(); auto iter = m_osd_messages.begin();
float position_x = 10.0f * scale; float position_x = 10.0f * scale;
@ -955,8 +956,11 @@ void CommonHostInterface::DrawOSDMessages()
} }
const float opacity = std::min(time_remaining, 1.0f); const float opacity = std::min(time_remaining, 1.0f);
const ImVec2 text_size(ImGui::CalcTextSize(msg.text.c_str(), nullptr));
const bool wrapped = (text_size.x > max_width);
ImGui::SetNextWindowPos(ImVec2(position_x, position_y)); ImGui::SetNextWindowPos(ImVec2(position_x, position_y));
ImGui::SetNextWindowSize(ImVec2(0.0f, 0.0f)); ImGui::SetNextWindowSize(ImVec2(wrapped ? max_width : 0.0f, 0.0f));
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, opacity); ImGui::PushStyleVar(ImGuiStyleVar_Alpha, opacity);
char buf[64]; char buf[64];
@ -964,7 +968,11 @@ void CommonHostInterface::DrawOSDMessages()
if (ImGui::Begin(buf, nullptr, window_flags)) if (ImGui::Begin(buf, nullptr, window_flags))
{ {
if (wrapped)
ImGui::TextWrapped("%s", msg.text.c_str());
else
ImGui::TextUnformatted(msg.text.c_str()); ImGui::TextUnformatted(msg.text.c_str());
position_y += ImGui::GetWindowSize().y + (4.0f * scale); position_y += ImGui::GetWindowSize().y + (4.0f * scale);
} }