ImGuiManager: Make margins consistent across OSD/achievements

Author: stenzek

src/core/fullscreenui_widgets.cpp

@@ -5345,7 +5345,7 @@ void FullscreenUI::UpdateNotificationsRunIdle()
 FullscreenUI::NotificationLayout::NotificationLayout(NotificationLocation location)
   : m_spacing(LayoutScale(10.0f)), m_location(location)
 {
-  const float screen_margin = std::max(ImGuiManager::GetScreenMargin(), LayoutScale(10.0f));
+  const float screen_margin = ImGuiManager::GetScreenMargin();
 
   // android goes a little lower due to on-screen buttons
 #ifndef __ANDROID__

src/core/imgui_overlays.cpp

@@ -243,10 +243,9 @@ void ImGuiManager::RenderTextOverlays(const GPUBackend* gpu)
   const bool paused = VideoThread::IsSystemPaused();
 
   const float scale = ImGuiManager::GetGlobalScale();
-  const float f_margin = ImGuiManager::GetScreenMargin() * scale;
-  const float margin = ImCeil(ImGuiManager::GetScreenMargin() * scale);
+  const float margin = ImGuiManager::GetScreenMargin();
   const float spacing = ImCeil(5.0f * scale);
-  float position_y = ImFloor(f_margin);
+  float position_y = margin;
   DrawPerformanceOverlay(gpu, position_y, scale, margin, spacing);
   DrawMediaCaptureOverlay(position_y, scale, margin, spacing);
 
@@ -646,7 +645,7 @@ void ImGuiManager::DrawEnhancementsOverlay(const GPUBackend* gpu)
 
   const float scale = ImGuiManager::GetGlobalScale();
   const float shadow_offset = 1.0f * scale;
-  const float margin = ImGuiManager::GetScreenMargin() * scale;
+  const float margin = ImGuiManager::GetScreenMargin();
   ImFont* const font = ImGuiManager::GetFixedFont();
   const float font_size = ImGuiManager::GetFixedFontSize();
   const float font_weight = 600.0f;
@@ -861,7 +860,7 @@ void ImGuiManager::DrawInputsOverlay()
 {
   const float scale = ImGuiManager::GetGlobalScale();
   const float shadow_offset = ImCeil(1.0f * scale);
-  const float margin = ImGuiManager::GetScreenMargin() * scale;
+  const float margin = ImGuiManager::GetScreenMargin();
   const float spacing = ImCeil(5.0f * scale);
   ImFont* const font = ImGuiManager::GetTextFont();
   const float font_size = ImGuiManager::GetOSDFontSize();

src/util/imgui_manager.cpp

@@ -1060,7 +1060,7 @@ void ImGuiManager::DrawOSDMessages(Timer::Value current_time)
   const ImVec4 subtext_color = DarkerColor(text_color, 0.85f);
   const float scale = s_state.global_scale;
   const float spacing = std::ceil(6.0f * scale);
-  const float margin = std::ceil(GetScreenMargin() * scale);
+  const float margin = GetScreenMargin();
   const float padding = std::ceil(10.0f * scale);
   const float rounding = std::ceil(10.0f * scale);
   const float normal_icon_margin = std::ceil(4.0f * scale);
@@ -1280,7 +1280,7 @@ float ImGuiManager::GetGlobalScale()
 
 float ImGuiManager::GetScreenMargin()
 {
-  return g_gpu_settings.display_osd_margin;
+  return std::ceil(g_gpu_settings.display_osd_margin * s_state.global_scale);
 }
 
 ImFont* ImGuiManager::GetTextFont()