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

FullscreenUI: Render notifications on top of OSD

This commit is contained in:
Stenzek 2025-01-12 19:14:59 +10:00
parent 035762af94
commit 19ee37cd10
No known key found for this signature in database
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/gpu_thread.cpp
View File

@ -16,6 +16,7 @@
#include "system_private.h" #include "system_private.h"
#include "util/gpu_device.h" #include "util/gpu_device.h"
#include "util/imgui_fullscreen.h"
#include "util/imgui_manager.h" #include "util/imgui_manager.h"
#include "util/input_manager.h" #include "util/input_manager.h"
#include "util/postprocessing.h" #include "util/postprocessing.h"
@ -1234,12 +1235,15 @@ void GPUThread::Internal::PresentFrame(bool allow_skip_present, u64 present_time
if (s_state.gpu_backend && System::IsValid()) if (s_state.gpu_backend && System::IsValid())
ImGuiManager::RenderTextOverlays(s_state.gpu_backend.get()); ImGuiManager::RenderTextOverlays(s_state.gpu_backend.get());
ImGuiManager::RenderOverlayWindows();
ImGuiManager::RenderOSDMessages(); ImGuiManager::RenderOSDMessages();
ImGuiFullscreen::RenderOverlays();
if (s_state.gpu_backend && System::GetState() == System::State::Running) if (s_state.gpu_backend && System::GetState() == System::State::Running)
ImGuiManager::RenderSoftwareCursors(); ImGuiManager::RenderSoftwareCursors();
ImGuiManager::RenderOverlayWindows();
ImGuiManager::RenderDebugWindows(); ImGuiManager::RenderDebugWindows();
} }

32
src/util/imgui_fullscreen.cpp
View File

@ -514,6 +514,19 @@ void ImGuiFullscreen::EndLayout()
DrawFullscreenFooter(); DrawFullscreenFooter();
PopResetLayout();
s_state.fullscreen_footer_text.clear();
s_state.rendered_menu_item_border = false;
s_state.had_hovered_menu_item = std::exchange(s_state.has_hovered_menu_item, false);
}
void ImGuiFullscreen::RenderOverlays()
{
if (!s_state.initialized)
return;
const float margin = std::max(ImGuiManager::GetScreenMargin(), LayoutScale(10.0f)); const float margin = std::max(ImGuiManager::GetScreenMargin(), LayoutScale(10.0f));
const float spacing = LayoutScale(10.0f); const float spacing = LayoutScale(10.0f);
const float notification_vertical_pos = GetNotificationVerticalPosition(); const float notification_vertical_pos = GetNotificationVerticalPosition();
@ -522,13 +535,6 @@ void ImGuiFullscreen::EndLayout()
DrawBackgroundProgressDialogs(position, spacing); DrawBackgroundProgressDialogs(position, spacing);
DrawNotifications(position, spacing); DrawNotifications(position, spacing);
DrawToast(); DrawToast();
PopResetLayout();
s_state.fullscreen_footer_text.clear();
s_state.rendered_menu_item_border = false;
s_state.had_hovered_menu_item = std::exchange(s_state.has_hovered_menu_item, false);
} }
void ImGuiFullscreen::PushResetLayout() void ImGuiFullscreen::PushResetLayout()
@ -2858,14 +2864,6 @@ void ImGuiFullscreen::DrawBackgroundProgressDialogs(ImVec2& position, float spac
const float window_width = LayoutScale(500.0f); const float window_width = LayoutScale(500.0f);
const float window_height = LayoutScale(75.0f); const float window_height = LayoutScale(75.0f);
ImGui::PushStyleColor(ImGuiCol_WindowBg, UIStyle.PrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_PlotHistogram, UIStyle.SecondaryStrongColor);
ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, LayoutScale(4.0f));
ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, LayoutScale(1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, LayoutScale(10.0f, 10.0f));
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, LayoutScale(10.0f, 10.0f));
ImGui::PushFont(UIStyle.MediumFont);
ImDrawList* dl = ImGui::GetForegroundDrawList(); ImDrawList* dl = ImGui::GetForegroundDrawList();
for (const BackgroundProgressDialogData& data : s_state.background_progress_dialogs) for (const BackgroundProgressDialogData& data : s_state.background_progress_dialogs)
@ -2911,10 +2909,6 @@ void ImGuiFullscreen::DrawBackgroundProgressDialogs(ImVec2& position, float spac
position.y += s_notification_vertical_direction * (window_height + spacing); position.y += s_notification_vertical_direction * (window_height + spacing);
} }
ImGui::PopFont();
ImGui::PopStyleVar(4);
ImGui::PopStyleColor(2);
} }
void ImGuiFullscreen::RenderLoadingScreen(std::string_view image, std::string_view message, s32 progress_min /*= -1*/, void ImGuiFullscreen::RenderLoadingScreen(std::string_view image, std::string_view message, s32 progress_min /*= -1*/,

2
src/util/imgui_fullscreen.h
View File

@ -144,6 +144,8 @@ void UploadAsyncTextures();
void BeginLayout(); void BeginLayout();
void EndLayout(); void EndLayout();
void RenderOverlays();
void PushResetLayout(); void PushResetLayout();
void PopResetLayout(); void PopResetLayout();