From 825d358072e7e7650d7d7eae98bda9a2f3f210fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 17 Feb 2025 11:47:35 -0600 Subject: [PATCH] Rename PopupHeaderStyle to PopupTitleStyle --- Common/UI/View.cpp | 6 +++--- Common/UI/View.h | 2 +- UI/Theme.cpp | 10 +++++----- assets/themes/1995.ini | 4 ++-- assets/themes/defaultthemes.ini | 8 ++++---- assets/themes/slateforest.ini | 4 ++-- assets/themes/vinewood.ini | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Common/UI/View.cpp b/Common/UI/View.cpp index 0d6b7cb7cf..a250ffc305 100644 --- a/Common/UI/View.cpp +++ b/Common/UI/View.cpp @@ -711,11 +711,11 @@ void PopupHeader::Draw(UIContext &dc) { } // Header background - dc.FillRect(dc.theme->popupHeaderStyle.background, bounds_); + dc.FillRect(dc.theme->popupTitleStyle.background, bounds_); // Header title text - dc.DrawText(text_, bounds_.x + tx, bounds_.centerY(), dc.theme->popupHeaderStyle.fgColor, ALIGN_LEFT | ALIGN_VCENTER); + dc.DrawText(text_, bounds_.x + tx, bounds_.centerY(), dc.theme->popupTitleStyle.fgColor, ALIGN_LEFT | ALIGN_VCENTER); // Underline - dc.Draw()->DrawImageCenterTexel(dc.theme->whiteImage, bounds_.x, bounds_.y2()-2, bounds_.x2(), bounds_.y2(), dc.theme->popupHeaderStyle.fgColor); + dc.Draw()->DrawImageCenterTexel(dc.theme->whiteImage, bounds_.x, bounds_.y2()-2, bounds_.x2(), bounds_.y2(), dc.theme->popupTitleStyle.fgColor); if (availableWidth < tw) { dc.PopScissor(); diff --git a/Common/UI/View.h b/Common/UI/View.h index 01c648cec1..89bf62a3bb 100644 --- a/Common/UI/View.h +++ b/Common/UI/View.h @@ -110,7 +110,7 @@ struct Theme { Style collapsibleHeaderStyle; Style popupStyle; - Style popupHeaderStyle; + Style popupTitleStyle; Style tooltipStyle; diff --git a/UI/Theme.cpp b/UI/Theme.cpp index 0a93b95378..914236de33 100644 --- a/UI/Theme.cpp +++ b/UI/Theme.cpp @@ -51,8 +51,8 @@ struct ThemeInfo { uint32_t uInfoStyleBg = 0x00000000; uint32_t uPopupStyleFg = 0xFFFFFFFF; uint32_t uPopupStyleBg = 0xFF303030; - uint32_t uPopupHeaderStyleFg = 0xFFFFFFFF; - uint32_t uPopupHeaderStyleBg = 0x00000000; // default to invisible + uint32_t uPopupTitleStyleFg = 0xFFFFFFFF; + uint32_t uPopupTitleStyleBg = 0x00000000; // default to invisible uint32_t uTooltipStyleFg = 0xFFFFFFFF; uint32_t uTooltipStyleBg = 0xC0303030; uint32_t uCollapsibleHeaderStyleFg = 0xFFFFFFFF; @@ -148,8 +148,8 @@ static void LoadThemeInfo(const std::vector &directories) { section.Get("PopupStyleBg", &info.uPopupStyleBg, info.uPopupStyleBg); section.Get("TooltipStyleFg", &info.uTooltipStyleFg, info.uTooltipStyleFg); // Backwards compat section.Get("TooltipStyleBg", &info.uTooltipStyleBg, info.uTooltipStyleBg); - section.Get("PopupHeaderStyleFg", &info.uPopupHeaderStyleFg, info.uItemStyleFg); // Backwards compat - section.Get("PopupHeaderStyleBg", &info.uPopupHeaderStyleBg, info.uPopupHeaderStyleBg); + section.Get("PopupHeaderStyleFg", &info.uPopupTitleStyleFg, info.uItemStyleFg); // Backwards compat + section.Get("PopupHeaderStyleBg", &info.uPopupTitleStyleBg, info.uPopupTitleStyleBg); section.Get("CollapsibleHeaderStyleFg", &info.uCollapsibleHeaderStyleFg, info.uItemStyleFg); // Backwards compat section.Get("CollapsibleHeaderStyleBg", &info.uCollapsibleHeaderStyleBg, info.uItemStyleBg); section.Get("BackgroundColor", &info.uBackgroundColor, info.uBackgroundColor); @@ -256,7 +256,7 @@ void UpdateTheme(UIContext *ctx) { ui_theme.infoStyle = MakeStyle(themeInfo.uInfoStyleFg, themeInfo.uInfoStyleBg); ui_theme.popupStyle = MakeStyle(themeInfo.uPopupStyleFg, themeInfo.uPopupStyleBg); - ui_theme.popupHeaderStyle = MakeStyle(themeInfo.uPopupHeaderStyleFg, themeInfo.uPopupHeaderStyleBg); + ui_theme.popupTitleStyle = MakeStyle(themeInfo.uPopupTitleStyleFg, themeInfo.uPopupTitleStyleBg); ui_theme.tooltipStyle = MakeStyle(themeInfo.uTooltipStyleFg, themeInfo.uTooltipStyleBg); diff --git a/assets/themes/1995.ini b/assets/themes/1995.ini index 3c193d8c14..d7560670ee 100644 --- a/assets/themes/1995.ini +++ b/assets/themes/1995.ini @@ -26,8 +26,8 @@ InfoStyleFg = "#FFFFFFFF" InfoStyleBg = "#00000000" PopupStyleFg = "#000000FF" PopupStyleBg = "#FFFFAAFF" -PopupHeaderStyleFg = "#FFFFFFFF" -PopupHeaderStyleBg = "#000080FF" +PopupTitleStyleFg = "#FFFFFFFF" +PopupTitleStyleBg = "#000080FF" CollapsibleHeaderStyleFg = "#000000FF" CollapsibleHeaderStyleBg = "#C0C0C0FF" TooltipStyleFg = "#FFFFFFFF" diff --git a/assets/themes/defaultthemes.ini b/assets/themes/defaultthemes.ini index 76c5558f96..c8e8a0a14f 100644 --- a/assets/themes/defaultthemes.ini +++ b/assets/themes/defaultthemes.ini @@ -14,8 +14,8 @@ InfoStyleFg = "#FFFFFFFF" InfoStyleBg = "#00000000" PopupStyleFg = "#FFFFFFFF" PopupStyleBg = "#1f4d5eFF" -PopupHeaderStyleFg = "#FFFFFFFF" -PopupHeaderStyleBg = "#00000000" +PopupTitleStyleFg = "#FFFFFFFF" +PopupTitleStyleBg = "#00000000" CollapsibleHeaderStyleFg = "#FFFFFFFF" CollapsibleHeaderStyleBg = "#00000055" TooltipStyleFg = "#FFFFFFFF" @@ -44,8 +44,8 @@ InfoStyleFg = "#FFFFFFFF" InfoStyleBg = "#00000000" PopupStyleFg = "#FFFFFFFF" PopupStyleBg = "#0c1d24FF" -PopupHeaderStyleFg = "#FFFFFFFF" -PopupHeaderStyleBg = "#00000000" +PopupTitleStyleFg = "#FFFFFFFF" +PopupTitleStyleBg = "#00000000" CollapsibleHeaderStyleFg = "#FFFFFFFF" CollapsibleHeaderStyleBg = "#00000055" TooltipStyleFg = "#FFFFFFFF" diff --git a/assets/themes/slateforest.ini b/assets/themes/slateforest.ini index 4abf128302..3d811e1e38 100644 --- a/assets/themes/slateforest.ini +++ b/assets/themes/slateforest.ini @@ -24,8 +24,8 @@ InfoStyleFg = "#FFFFFFFF" InfoStyleBg = "#00000000" PopupStyleFg = "#FFFFFFFF" PopupStyleBg = "#9498A1FF" -PopupHeaderStyleFg = "#FFFFFFFF" -PopupHeaderStyleBg = "#00000000" +PopupTitleStyleFg = "#FFFFFFFF" +PopupTitleStyleBg = "#00000000" CollapsibleHeaderStyleFg = "#FFFFFFFF" CollapsibleHeaderStyleBg = "#2D4459B0" TooltipStyleFg = "#FFFFFFFF" diff --git a/assets/themes/vinewood.ini b/assets/themes/vinewood.ini index b1dd3403a8..8cd769bf53 100644 --- a/assets/themes/vinewood.ini +++ b/assets/themes/vinewood.ini @@ -25,8 +25,8 @@ InfoStyleFg = "#FFFFFFFF" InfoStyleBg = "#00000000" PopupStyleFg = "#C3D7A4FF" PopupStyleBg = "#94B185FF" -PopupHeaderStyleFg = "#FFFFFFFF" -PopupHeaderStyleBg = "#00000000" +PopupTitleStyleFg = "#FFFFFFFF" +PopupTitleStyleBg = "#00000000" CollapsibleHeaderStyleFg = "#C3D7A4FF" CollapsibleHeaderStyleBg = "#000000C0" TooltipStyleFg = "#FFFFFFFF"