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>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 76aa4e6..c551044 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3400,20 +3400,6 @@
</info>
<value>15658734</value>
</prop>
<prop oor:name="StartCenterThumbnailsHighlightColor" oor:type="xs:int" oor:nillable="false">
<!-- Default 14540253 = 0xdddddd as specified in tdf#90452, comment 45 -->
<info>
<desc>Specifies the background color of the highlight of a thumbnail in the start center.</desc>
</info>
<value>14540253</value>
</prop>
<prop oor:name="StartCenterThumbnailsHighlightTextColor" oor:type="xs:int" oor:nillable="false">
<!-- Default 3355443 = 0x333333 as specified in tdf#90452, comment 45 -->
<info>
<desc>Specifies the text color of the highlight of a thumbnail in the start center.</desc>
</info>
<value>3355443</value>
</prop>
</group>
</group>
<group oor:name="Vectorize">
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index cc2e80de..055dc69 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 17ad2ba..34d4087 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();