summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2019-07-11 12:50:42 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-07-15 00:26:35 +0200
commit7ccc93d947ba3333cba6d99a03ed2d0c27b1983a (patch)
tree5535d74b4d297b1b8b3d22cc75f84b20048ce8df
parentd8ba2f6c559218191482489fa4d8e5b760ebbd5f (diff)
tdf#126333 use dialog color for "button" highlight
This control has many more problems. This is just a minimal fix, so it'll use dialog color for the highlight. In addition it uses the same color for the arrow then for the text. Reviewed-on: https://gerrit.libreoffice.org/75419 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 2060f9598bc4480c44465abc9250b595c09af188) Reviewed-on: https://gerrit.libreoffice.org/75425 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 54af6c8c873c3f6311806d210d5243b03e2d9fdf) Change-Id: Iaf263087bc09309267b2d165331d710dfc92fc77 Reviewed-on: https://gerrit.libreoffice.org/75502 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sw/source/uibase/misc/swruler.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 1784ac20dbcd..86667e6b02d7 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -116,7 +116,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext)
// Paint comment control background
// TODO Check if these are best colors to be used
- Color aBgColor = GetFadedColor( rStyleSettings.GetDarkShadowColor(), rStyleSettings.GetWorkspaceColor() );
+ Color aBgColor = GetFadedColor( rStyleSettings.GetDialogColor(), rStyleSettings.GetWorkspaceColor() );
maVirDev->SetFillColor( aBgColor );
if ( mbIsHighlighted || !bIsCollapsed )
@@ -185,8 +185,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext)
// Draw arrow
// FIXME consistence of button colors. https://opengrok.libreoffice.org/xref/core/vcl/source/control/button.cxx#785
- Color aArrowColor = GetFadedColor(COL_BLACK, rStyleSettings.GetShadowColor());
- ImplDrawArrow(*maVirDev.get(), aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight);
+ ImplDrawArrow(*maVirDev.get(), aArrowPos.X(), aArrowPos.Y(), aTextColor, bArrowToRight);
// Blit comment control
rRenderContext.DrawOutDev(aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev.get());