diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2023-11-10 10:12:39 +0100 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2023-11-13 10:40:30 +0100 |
| commit | 285a3e8d8b77b44da3dcc767877f878fe0e0493e (patch) | |
| tree | 753273b429cc46cbe07b7dc8297d2b006cee16c9 /sfx2/source | |
| parent | b047c9b21b75f58429c5f55d2838f154c0ea6293 (diff) | |
Resolves tdf#158084 - Use system colors in start center
StartCenterThumbnailsHighlightColor and StartCenterThumbnailsHighlightTextColor
removed in favor of StyleSettings.GetHighlightColor and .GetActiveColor
Change-Id: I7005b17f6c48525c791f23ea99b7b68e7a67531b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159286
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/recentdocsview.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/control/templatedefaultview.cxx | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index cc2e80de17e9..055dc6962423 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -76,8 +76,13 @@ RecentDocsView::RecentDocsView(std::unique_ptr<weld::ScrolledWindow> xWindow, st maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); - maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); - maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + + const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); + maHighlightColor = rSettings.GetHighlightColor(); + maHighlightTextColor = rSettings.GetHighlightTextColor(); + maSelectHighlightColor = rSettings.GetActiveColor(); + maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors(); diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 17ad2ba7cbda..34d40875d23c 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -33,8 +33,13 @@ TemplateDefaultView::TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> x // startcenter specific settings maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); - maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); - maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + + const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); + maHighlightColor = rSettings.GetHighlightColor(); + maHighlightTextColor = rSettings.GetHighlightTextColor(); + maSelectHighlightColor = rSettings.GetActiveColor(); + maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors(); |