summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-09-19 20:53:34 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2020-10-07 04:12:36 +0200
commita927e0964ba0442d53fffb22c577e54bcf183ed7 (patch)
tree47edbaedfa42f0c590677f07371beb98d5a12a41 /sfx2/source/dialog
parenta883002d8e2fd77f80c43b7b2e6ac329d83d929d (diff)
tdf#136555 drop custom start center button colors
Custom button text or background colors don't play nice with any complex theming. Maybe we should still allow a custom background color for the button bar, but probably that attempt is also futile and clashes with theming easily. As long as the botton bar uses themable push-buttons as a control custom coloring will break at some point, as these buttons can have too many states, which curently depend on the theme. There is no way for LO to know, if a roll-over button will return with a different backround or just some changed border from a themed paint call. So this reverts the button part of tdf#90452. It doesn't affect the preview area, as that is a custom widget, which doesn't use any theming, but has it's own setting - for better or worse. Change-Id: I1ef17a50d15a5876a11bce89ae3f764aa91f66bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103041 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/backingwindow.cxx16
-rw-r--r--sfx2/source/dialog/backingwindow.hxx1
2 files changed, 0 insertions, 17 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index ead00a2beeb9..48bb6c1cf416 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -68,7 +68,6 @@ float const fMultiplier = 1.4f;
BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
Window( i_pParent ),
mbLocalViewInitialized(false),
- maButtonsTextColor(Color(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get())),
mbInitControls( false )
{
m_pUIBuilder.reset(new VclBuilder(this, AllSettings::GetUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" ));
@@ -255,19 +254,10 @@ void BackingWindow::initControls()
mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, ExtLinkClickHdl));
// setup nice colors
- mpCreateLabel->SetControlForeground(maButtonsTextColor);
vcl::Font aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont());
aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
mpCreateLabel->SetControlFont(aFont);
- mpHelpButton->SetControlForeground(maButtonsTextColor);
- mpExtensionsButton->SetControlForeground(maButtonsTextColor);
-
- const Color aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get());
-
- mpAllButtonsBox->SetBackground(aButtonsBackground);
- mpSmallButtonsBox->SetBackground(aButtonsBackground);
-
// motif image under the buttons
Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx());
aWallpaper.SetStyle(WallpaperStyle::BottomRight);
@@ -307,9 +297,6 @@ void BackingWindow::setupButton( PushButton* pButton )
vcl::Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
pButton->SetControlFont(aFont);
-
- // color that fits the theme
- pButton->SetControlForeground(maButtonsTextColor);
pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
}
@@ -319,9 +306,6 @@ void BackingWindow::setupButton( MenuToggleButton* pButton )
aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
pButton->SetControlFont(aFont);
- // color that fits the theme
- pButton->SetControlForeground(maButtonsTextColor);
-
PopupMenu* pMenu = pButton->GetPopupMenu();
pMenu->SetMenuFlags(pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries);
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 15ab2fe0728f..99d7bd6b7ccc 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -78,7 +78,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
std::vector< VclPtr<vcl::Window> > maDndWindows;
- Color maButtonsTextColor;
tools::Rectangle maStartCentButtons;
bool mbInitControls;