From 44a4f2703a70e1437dedf3cab34c88bf57d62eb7 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 11 Apr 2024 12:44:33 +1000 Subject: [PATCH] ImGuiFullscreen: Add popup background colour --- src/util/imgui_fullscreen.cpp | 6 +++++- src/util/imgui_fullscreen.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp index 11dc080e5..e2a6077fc 100644 --- a/src/util/imgui_fullscreen.cpp +++ b/src/util/imgui_fullscreen.cpp @@ -74,6 +74,7 @@ ImVec4 UIBackgroundColor; ImVec4 UIBackgroundTextColor; ImVec4 UIBackgroundLineColor; ImVec4 UIBackgroundHighlightColor; +ImVec4 UIPopupBackgroundColor; ImVec4 UIDisabledColor; ImVec4 UIPrimaryColor; ImVec4 UIPrimaryLightColor; @@ -555,11 +556,12 @@ void ImGuiFullscreen::PushResetLayout() ImGui::PushStyleColor(ImGuiCol_ScrollbarGrab, UIPrimaryColor); ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabHovered, UIPrimaryLightColor); ImGui::PushStyleColor(ImGuiCol_ScrollbarGrabActive, UIPrimaryDarkColor); + ImGui::PushStyleColor(ImGuiCol_PopupBg, UIPopupBackgroundColor); } void ImGuiFullscreen::PopResetLayout() { - ImGui::PopStyleColor(10); + ImGui::PopStyleColor(11); ImGui::PopStyleVar(12); } @@ -3020,6 +3022,7 @@ void ImGuiFullscreen::SetTheme(bool light) UIBackgroundTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); UIBackgroundLineColor = HEX_TO_IMVEC4(0xf0f0f0, 0xff); UIBackgroundHighlightColor = HEX_TO_IMVEC4(0x4b4b4b, 0xff); + UIPopupBackgroundColor = HEX_TO_IMVEC4(0x212121, 0xf2); UIPrimaryColor = HEX_TO_IMVEC4(0x2e2e2e, 0xff); UIPrimaryLightColor = HEX_TO_IMVEC4(0x484848, 0xff); UIPrimaryDarkColor = HEX_TO_IMVEC4(0x000000, 0xff); @@ -3039,6 +3042,7 @@ void ImGuiFullscreen::SetTheme(bool light) UIBackgroundTextColor = HEX_TO_IMVEC4(0x000000, 0xff); UIBackgroundLineColor = HEX_TO_IMVEC4(0xe1e2e1, 0xff); UIBackgroundHighlightColor = HEX_TO_IMVEC4(0xe1e2e1, 0xff); + UIPopupBackgroundColor = HEX_TO_IMVEC4(0xd8d8d8, 0xf2); UIPrimaryColor = HEX_TO_IMVEC4(0x2a3e78, 0xff); UIPrimaryLightColor = HEX_TO_IMVEC4(0x235cd9, 0xff); UIPrimaryDarkColor = HEX_TO_IMVEC4(0x1d2953, 0xff); diff --git a/src/util/imgui_fullscreen.h b/src/util/imgui_fullscreen.h index b5ee5c3d2..a128190a8 100644 --- a/src/util/imgui_fullscreen.h +++ b/src/util/imgui_fullscreen.h @@ -54,6 +54,7 @@ extern ImVec4 UIBackgroundColor; extern ImVec4 UIBackgroundTextColor; extern ImVec4 UIBackgroundLineColor; extern ImVec4 UIBackgroundHighlightColor; +extern ImVec4 UIPopupBackgroundColor; extern ImVec4 UIDisabledColor; extern ImVec4 UIPrimaryColor; extern ImVec4 UIPrimaryLightColor;