Resolves tdf#170143 - Set ButtonTextColor on theme change
Reverts c7a29af1d7
Change-Id: I50215c3e161d3e22ed34c7407c22cdae50fff045
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198250
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
committed by
Heiko Tietze
parent
fde80f0497
commit
5c723785d4
@@ -413,11 +413,6 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen
|
||||
|
||||
if (bOffScreen)
|
||||
{
|
||||
if (ThemeColors::IsThemeEnabled())
|
||||
{
|
||||
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
|
||||
mpImplData->mpVirDev->SetTextColor(rStyleSettings.GetWindowTextColor());
|
||||
}
|
||||
mpImplData->mpVirDev->DrawText(
|
||||
aTextPos,
|
||||
pItem->maText,
|
||||
|
||||
@@ -2555,6 +2555,7 @@ static void lcl_LoadColorsFromTheme(StyleSettings& rStyleSet)
|
||||
rStyleSet.SetMenuBarTextColor(rThemeColors.GetMenuBarTextColor());
|
||||
rStyleSet.SetMenuTextColor(rThemeColors.GetMenuTextColor());
|
||||
|
||||
rStyleSet.SetButtonTextColor(rThemeColors.GetButtonTextColor());
|
||||
rStyleSet.SetDefaultActionButtonTextColor(rThemeColors.GetButtonTextColor());
|
||||
rStyleSet.SetActionButtonTextColor(rThemeColors.GetButtonTextColor());
|
||||
rStyleSet.SetShadowColor(rThemeColors.GetShadeColor());
|
||||
|
||||
Reference in New Issue
Block a user