include/sfx2/thumbnailview.hxx | 2 --
include/sfx2/thumbnailviewitem.hxx | 2 --
sfx2/source/control/recentdocsview.cxx | 4 +---
sfx2/source/control/templatedefaultview.cxx | 4 +---
sfx2/source/control/templateviewitem.cxx | 2 +-
sfx2/source/control/thumbnailview.cxx | 4 ----
sfx2/source/control/thumbnailviewitem.cxx | 7 ++-----
7 files changed, 5 insertions(+), 20 deletions(-)
New commits:
commit adfb0a34af196befc46527418f6e870d1f8f1889
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Nov 14 11:35:43 2023 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Nov 14 13:26:53 2023 +0100
Resolves tdf#158084 - Start Center hover color
Selected colors removed since hovering leads to selection
(or execution) and does not need a special color
Transparency for reccent documents and templates in start center
increased to make the difference to selected more clear
Change-Id: Iab52150cd5a93e2f6ff716921b2aa7d093018b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159407
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a51db9df048b..655aa3ba13e5 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -313,8 +313,6 @@ protected:
Color maTextColor; ///< Text color.
Color maHighlightColor; ///< Color of the highlight (background)
of the hovered item.
Color maHighlightTextColor; ///< Color of the text for the highlighted
item.
- Color maSelectHighlightColor; ///< Color of the highlight (background)
of the selected and hovered item.
- Color maSelectHighlightTextColor; ///< Color of the text of the selected
and hovered item.
double mfHighlightTransparence; ///< Transparence of the highlight.
Link<const ThumbnailViewItem*, void> maItemStateHdl;
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index 9495b08054e3..22020c47728d 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -56,8 +56,6 @@ struct ThumbnailItemAttributes
basegfx::BColor aTextColor;
basegfx::BColor aHighlightColor;
basegfx::BColor aHighlightTextColor;
- basegfx::BColor aSelectHighlightColor;
- basegfx::BColor aSelectHighlightTextColor;
double fHighlightTransparence;
basegfx::B2DVector aFontSize;
drawinglayer::attribute::FontAttribute aFontAttr;
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 055dc6962423..6df534788a32 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -80,10 +80,8 @@
RecentDocsView::RecentDocsView(std::unique_ptr<weld::ScrolledWindow> xWindow, st
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
- maSelectHighlightColor = rSettings.GetActiveColor();
- maSelectHighlightTextColor = rSettings.GetActiveTextColor();
- mfHighlightTransparence = 0.25;
+ mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templatedefaultview.cxx
b/sfx2/source/control/templatedefaultview.cxx
index 34d40875d23c..909545e423ce 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -37,10 +37,8 @@
TemplateDefaultView::TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> x
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
- maSelectHighlightColor = rSettings.GetActiveColor();
- maSelectHighlightTextColor = rSettings.GetActiveTextColor();
- mfHighlightTransparence = 0.25;
+ mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templateviewitem.cxx
b/sfx2/source/control/templateviewitem.cxx
index 28ff1f43133c..d28ad50f74cd 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -61,7 +61,7 @@ void
TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
// Draw background
if( mbSelected && mbHover)
- aFillColor = pAttrs->aSelectHighlightColor;
+ aFillColor = pAttrs->aHighlightColor;
else if (mbSelected || mbHover)
{
aFillColor = pAttrs->aHighlightColor;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 2d4e8bb57611..abb9f9799e34 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -253,8 +253,6 @@ void ThumbnailView::ImplInit()
maTextColor = rSettings.GetWindowTextColor();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
- maSelectHighlightColor = rSettings.GetActiveColor();
- maSelectHighlightTextColor = rSettings.GetActiveTextColor();
mfHighlightTransparence =
SvtOptionsDrawinglayer::GetTransparentSelectionPercent() * 0.01;
@@ -271,8 +269,6 @@ void ThumbnailView::UpdateColors()
mpItemAttrs->aTextColor = maTextColor.getBColor();
mpItemAttrs->aHighlightColor = maHighlightColor.getBColor();
mpItemAttrs->aHighlightTextColor = maHighlightTextColor.getBColor();
- mpItemAttrs->aSelectHighlightColor = maSelectHighlightColor.getBColor();
- mpItemAttrs->aSelectHighlightTextColor =
maSelectHighlightTextColor.getBColor();
mpItemAttrs->fHighlightTransparence = mfHighlightTransparence;
}
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index 817b17427646..56cfee35f199 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -155,7 +155,7 @@ void ThumbnailViewItem::Paint
(drawinglayer::processor2d::BaseProcessor2D *pProc
// Draw background
if( mbSelected && mbHover)
- aFillColor = pAttrs->aSelectHighlightColor;
+ aFillColor = pAttrs->aHighlightColor;
else if (mbSelected || mbHover)
{
aFillColor = pAttrs->aHighlightColor;
@@ -268,10 +268,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString&
rText, const Thumbnai
BColor aTextColor = pAttrs->aTextColor;
if(mbSelected)
{
- if (mbHover)
- aTextColor = pAttrs->aSelectHighlightTextColor;
- else
- aTextColor = pAttrs->aHighlightTextColor;
+ aTextColor = pAttrs->aHighlightTextColor;
}
rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
