Emulator-Archive/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2024-11-23 05:49:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ImGuiOverlays: Fix input overlay glyph clipping
Some checks are pending
Create rolling release / Windows x64 Build (push) Waiting to run
Details
Create rolling release / Windows x64 SSE2 Build (push) Waiting to run
Details
Create rolling release / Windows ARM64 Build (push) Waiting to run
Details
Create rolling release / Linux x64 AppImage (push) Waiting to run
Details
Create rolling release / Linux x64 SSE2 AppImage (push) Waiting to run
Details
Create rolling release / MacOS Universal Build (push) Waiting to run
Details
Create rolling release / Create Release (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Stenzek 2024-10-25 12:45:50 +10:00
parent 903213c818
commit cdd230c040
No known key found for this signature in database
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/imgui_overlays.cpp
View File

@ -276,9 +276,10 @@ void ImGuiManager::RenderTextOverlays()
if (state != System::State::Shutdown) if (state != System::State::Shutdown)
{ {
const float scale = ImGuiManager::GetGlobalScale(); const float scale = ImGuiManager::GetGlobalScale();
const float margin = std::ceil(ImGuiManager::GetScreenMargin() * scale); const float f_margin = ImGuiManager::GetScreenMargin() * scale;
const float spacing = std::ceil(5.0f * scale); const float margin = ImCeil(ImGuiManager::GetScreenMargin() * scale);
float position_y = margin; const float spacing = ImCeil(5.0f * scale);
float position_y = ImFloor(f_margin);
DrawPerformanceOverlay(position_y, scale, margin, spacing); DrawPerformanceOverlay(position_y, scale, margin, spacing);
DrawFrameTimeOverlay(position_y, scale, margin, spacing); DrawFrameTimeOverlay(position_y, scale, margin, spacing);
DrawMediaCaptureOverlay(position_y, scale, margin, spacing); DrawMediaCaptureOverlay(position_y, scale, margin, spacing);
@ -593,8 +594,8 @@ void ImGuiManager::DrawMediaCaptureOverlay(float& position_y, float scale, float
-1.0f, text_msg.c_str(), text_msg.end_ptr(), nullptr); -1.0f, text_msg.c_str(), text_msg.end_ptr(), nullptr);
const float box_margin = 5.0f * scale; const float box_margin = 5.0f * scale;
const ImVec2 box_size = ImVec2(icon_size.x + shadow_offset + text_size.x + box_margin * 2.0f, const ImVec2 box_size = ImVec2(ImCeil(icon_size.x + shadow_offset + text_size.x + box_margin * 2.0f),
std::max(icon_size.x, text_size.y) + box_margin * 2.0f); ImCeil(std::max(icon_size.x, text_size.y) + box_margin * 2.0f));
const ImVec2 box_pos = ImVec2(ImGui::GetIO().DisplaySize.x - margin - box_size.x, position_y); const ImVec2 box_pos = ImVec2(ImGui::GetIO().DisplaySize.x - margin - box_size.x, position_y);
dl->AddRectFilled(box_pos, box_pos + box_size, IM_COL32(0, 0, 0, 64), box_margin); dl->AddRectFilled(box_pos, box_pos + box_size, IM_COL32(0, 0, 0, 64), box_margin);
@ -620,7 +621,7 @@ void ImGuiManager::DrawFrameTimeOverlay(float& position_y, float scale, float ma
const float shadow_offset = std::ceil(1.0f * scale); const float shadow_offset = std::ceil(1.0f * scale);
ImFont* fixed_font = ImGuiManager::GetFixedFont(); ImFont* fixed_font = ImGuiManager::GetFixedFont();
const ImVec2 history_size(200.0f * scale, 50.0f * scale); const ImVec2 history_size(ImCeil(200.0f * scale), ImCeil(50.0f * scale));
ImGui::SetNextWindowSize(ImVec2(history_size.x, history_size.y)); ImGui::SetNextWindowSize(ImVec2(history_size.x, history_size.y));
ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - margin - history_size.x, position_y)); ImGui::SetNextWindowPos(ImVec2(ImGui::GetIO().DisplaySize.x - margin - history_size.x, position_y));
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.0f, 0.0f, 0.0f, 0.25f)); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.0f, 0.0f, 0.0f, 0.25f));
@ -685,9 +686,9 @@ void ImGuiManager::DrawFrameTimeOverlay(float& position_y, float scale, float ma
void ImGuiManager::DrawInputsOverlay() void ImGuiManager::DrawInputsOverlay()
{ {
const float scale = ImGuiManager::GetGlobalScale(); const float scale = ImGuiManager::GetGlobalScale();
const float shadow_offset = 1.0f * scale; const float shadow_offset = ImCeil(1.0f * scale);
const float margin = ImGuiManager::GetScreenMargin() * scale; const float margin = ImGuiManager::GetScreenMargin() * scale;
const float spacing = 5.0f * scale; const float spacing = ImCeil(5.0f * scale);
ImFont* font = ImGuiManager::GetOSDFont(); ImFont* font = ImGuiManager::GetOSDFont();
static constexpr u32 text_color = IM_COL32(0xff, 0xff, 0xff, 255); static constexpr u32 text_color = IM_COL32(0xff, 0xff, 0xff, 255);
@ -703,10 +704,14 @@ void ImGuiManager::DrawInputsOverlay()
num_ports++; num_ports++;
} }
float current_x = margin; float current_x = ImFloor(margin);
float current_y = display_size.y - margin - ((static_cast<float>(num_ports) * (font->FontSize + spacing)) - spacing); float current_y =
ImFloor(display_size.y - margin - ((static_cast<float>(num_ports) * (font->FontSize + spacing)) - spacing));
const ImVec4 clip_rect(current_x, current_y, display_size.x - margin, display_size.y - margin); // This is a bit of a pain. Some of the glyphs slightly overhang/overshoot past the baseline, resulting
// in the glyphs getting clipped if we use the text height/margin as a clip point. Instead, just clamp it
// to the display size, the margin should be enough to allow for overshooting.
const ImVec4 clip_rect(current_x, current_y, display_size.x - margin, display_size.y);
SmallString text; SmallString text;