github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix some dialogs not being cancellable

Browse Source 
i.e. exitable with right mouse click/B button.
This commit is contained in:
Stenzek 2025-03-15 02:18:18 +10:00
parent db3b689166
commit 4bac7cb79e
No known key found for this signature in database
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/fullscreen_ui.cpp
View File

@ -4659,7 +4659,8 @@ void FullscreenUI::DrawControllerSettingsPage()
ImGui::SetNextWindowSize(LayoutScale(500.0f, 180.0f)); ImGui::SetNextWindowSize(LayoutScale(500.0f, 180.0f));
if (BeginFixedPopupModal(freq_label, nullptr)) bool is_open = true;
if (BeginFixedPopupModal(freq_label, &is_open))
{ {
ImGui::SetNextItemWidth(LayoutScale(450.0f)); ImGui::SetNextItemWidth(LayoutScale(450.0f));
if (ImGui::SliderInt("##value", &frequency, 0, 60, FSUI_CSTR("Toggle every %d frames"), if (ImGui::SliderInt("##value", &frequency, 0, 60, FSUI_CSTR("Toggle every %d frames"),

9
src/util/imgui_fullscreen.cpp
View File

@ -650,6 +650,12 @@ bool ImGuiFullscreen::BeginFixedPopupModal(const char* name, bool* p_open)
return false; return false;
} }
if (p_open && *p_open && WantsToCloseMenu())
{
*p_open = false;
ImGui::CloseCurrentPopup();
}
// don't draw unreadable text // don't draw unreadable text
ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor); ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor);
return true; return true;
@ -2816,6 +2822,9 @@ void ImGuiFullscreen::DrawMessageDialog()
if (ImGui::BeginPopupModal(win_id, &is_open, flags)) if (ImGui::BeginPopupModal(win_id, &is_open, flags))
{ {
if (WantsToCloseMenu())
is_open = false;
ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor); ImGui::PushStyleColor(ImGuiCol_Text, UIStyle.BackgroundTextColor);
ResetFocusHere(); ResetFocusHere();