Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-20 15:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ImGuiFullscreen: Use popup background for all popups

Browse source
This commit is contained in:
Stenzek 2024-04-11 13:50:04 +10:00
parent 164062f80d
commit 57f6bda59b
No known key found for this signature in database
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/fullscreen_ui.cpp
View file

@ -5596,7 +5596,6 @@ void FullscreenUI::DrawSaveStateSelector(bool is_loading)
ImGui::PushStyleColor(ImGuiCol_Text, UIPrimaryTextColor);
ImGui::PushStyleColor(ImGuiCol_TitleBg, UIPrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIPrimaryColor);
ImGui::PushStyleColor(ImGuiCol_PopupBg, MulAlpha(UIBackgroundColor, 0.95f));
const float width = LayoutScale(600.0f);
const float title_height =
@ -5680,7 +5679,7 @@ void FullscreenUI::DrawSaveStateSelector(bool is_loading)
QueueResetFocus();
}
ImGui::PopStyleColor(4);
ImGui::PopStyleColor(3);
ImGui::PopStyleVar(3);
ImGui::PopFont();
ImGuiFullscreen::PopResetLayout();

12
src/util/imgui_fullscreen.cpp
View file

@ -2141,7 +2141,6 @@ void ImGuiFullscreen::DrawFileSelector()
ImGui::PushStyleColor(ImGuiCol_Text, UIPrimaryTextColor);
ImGui::PushStyleColor(ImGuiCol_TitleBg, UIPrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIPrimaryColor);
ImGui::PushStyleColor(ImGuiCol_PopupBg, MulAlpha(UIBackgroundColor, 0.95f));
bool is_open = !WantsToCloseMenu();
bool directory_selected = false;
@ -2182,7 +2181,7 @@ void ImGuiFullscreen::DrawFileSelector()
is_open = false;
}
ImGui::PopStyleColor(4);
ImGui::PopStyleColor(3);
ImGui::PopStyleVar(3);
ImGui::PopFont();
@ -2270,7 +2269,6 @@ void ImGuiFullscreen::DrawChoiceDialog()
ImGui::PushStyleColor(ImGuiCol_Text, UIPrimaryTextColor);
ImGui::PushStyleColor(ImGuiCol_TitleBg, UIPrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIPrimaryColor);
ImGui::PushStyleColor(ImGuiCol_PopupBg, MulAlpha(UIBackgroundColor, 0.95f));
const float width = LayoutScale(600.0f);
const float title_height =
@ -2339,7 +2337,7 @@ void ImGuiFullscreen::DrawChoiceDialog()
is_open = false;
}
ImGui::PopStyleColor(4);
ImGui::PopStyleColor(3);
ImGui::PopStyleVar(3);
ImGui::PopFont();
@ -2394,7 +2392,6 @@ void ImGuiFullscreen::DrawInputDialog()
ImGui::PushStyleColor(ImGuiCol_Text, UIPrimaryTextColor);
ImGui::PushStyleColor(ImGuiCol_TitleBg, UIPrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIPrimaryColor);
ImGui::PushStyleColor(ImGuiCol_PopupBg, MulAlpha(UIBackgroundColor, 0.95f));
bool is_open = true;
if (ImGui::BeginPopupModal(s_input_dialog_title.c_str(), &is_open,
@ -2450,7 +2447,7 @@ void ImGuiFullscreen::DrawInputDialog()
else
GetInputDialogHelpText(s_fullscreen_footer_text);
ImGui::PopStyleColor(4);
ImGui::PopStyleColor(3);
ImGui::PopStyleVar(3);
ImGui::PopFont();
}
@ -2551,7 +2548,6 @@ void ImGuiFullscreen::DrawMessageDialog()
ImGui::PushStyleColor(ImGuiCol_Text, UIPrimaryTextColor);
ImGui::PushStyleColor(ImGuiCol_TitleBg, UIPrimaryDarkColor);
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, UIPrimaryColor);
ImGui::PushStyleColor(ImGuiCol_PopupBg, MulAlpha(UIBackgroundColor, 0.95f));
bool is_open = true;
const u32 flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
@ -2581,7 +2577,7 @@ void ImGuiFullscreen::DrawMessageDialog()
ImGui::EndPopup();
}
ImGui::PopStyleColor(4);
ImGui::PopStyleColor(3);
ImGui::PopStyleVar(4);
ImGui::PopFont();