summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorSahil Gautam <sahil.gautam.extern@allotropia.de>2024-11-20 16:43:43 +0530
committerSahil Gautam <sahil.gautam.extern@allotropia.de>2024-12-18 16:23:39 +0100
commitc4962247e40b5e6750c522d43359d9436dcfec68 (patch)
tree589261d48c67238359e47d6ed8c9e258ad017560 /vcl/win
parent7e4b7be35cf38acdd67ecaeb63c1c5f152afd4f5 (diff)
tdf#163620 [API CHANGE] remove persona/appearance-toggle related code
- remove ui and source files related to app colors and personalization tabs - remove persona entries from registry - remove functions related to persona settings from StyleSettings, vcl.. - remove ui and code related to tools - options - view - appearance combo box Change-Id: I98f0c38dc1facddd0e8dd03197c61a92287fdbc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176836 Tested-by: Jenkins Reviewed-by: Sahil Gautam <sahil.gautam.extern@allotropia.de>
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/gdi/salnativewidgets-luna.cxx2
-rw-r--r--vcl/win/window/salframe.cxx7
2 files changed, 1 insertions, 8 deletions
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index 2c1795fd5f9b..7d1cdc0c98eb 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1893,7 +1893,7 @@ void WinSalGraphics::updateSettingsNative( AllSettings& rSettings )
pSVData->maNWFData.mbDockingAreaAvoidTBFrames = true;
// FIXME get the color directly from the theme, not from the settings
- Color aMenuBarTextColor = aStyleSettings.GetPersonaMenuBarTextColor().value_or( aStyleSettings.GetMenuTextColor() );
+ Color aMenuBarTextColor = aStyleSettings.GetMenuTextColor();
// in aero menuitem highlight text is drawn in the same color as normal
// high contrast highlight color is not related to persona and not apply blur or transparency
bool bThemeLoaded = ThemeColors::IsThemeLoaded();
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 9a3705c4d525..f768f4340b2c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2852,13 +2852,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
}
- if ( std::optional<Color> aColor = aStyleSettings.GetPersonaMenuBarTextColor() )
- {
- aMenuBarTextColor = *aColor;
- if (!aStyleSettings.GetHighContrastMode())
- aMenuBarRolloverTextColor = *aColor;
- }
-
aStyleSettings.SetMenuBarTextColor( aMenuBarTextColor );
aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarRolloverTextColor );