diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-04-15 16:39:40 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-04-15 18:52:11 +0200 |
commit | 7d10bcb23624db11ca6445f5cb33a28660f16fd4 (patch) | |
tree | f73aa23b996e70033ba96b4bfd4a76927330a09a | |
parent | 786d3c2afdf70966617d13e27053dfd3964a0d89 (diff) |
tdf#50507 - zoom slider always looks like disabled
Slider smaller, in darkshadow color and with a tiny shadow
Change-Id: I0e5253648749fb4190c03ab458498d64dc0388c5
Reviewed-on: https://gerrit.libreoffice.org/52912
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
-rw-r--r-- | svx/source/stbctrls/zoomsliderctrl.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 449a1a9bc6fc..a8afa60b4cb7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -235,8 +235,8 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) tools::Rectangle aRect = rUsrEvt.GetRect(); tools::Rectangle aSlider = aRect; - long nSliderHeight = 2 * pDev->GetDPIScaleFactor(); - long nSnappingHeight = 4 * pDev->GetDPIScaleFactor(); + long nSliderHeight = 1 * pDev->GetDPIScaleFactor(); + long nSnappingHeight = 2 * pDev->GetDPIScaleFactor(); aSlider.AdjustTop((aControlRect.GetHeight() - nSliderHeight)/2 ); aSlider.SetBottom( aSlider.Top() + nSliderHeight - 1 ); @@ -247,9 +247,15 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) Color aOldFillColor = pDev->GetFillColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - pDev->SetLineColor( rStyleSettings.GetShadowColor() ); - pDev->SetFillColor( rStyleSettings.GetShadowColor() ); + pDev->SetLineColor( rStyleSettings.GetDarkShadowColor() ); + pDev->SetFillColor( rStyleSettings.GetDarkShadowColor() ); + // draw slider + pDev->DrawRect( aSlider ); + // shadow + pDev->SetLineColor( rStyleSettings.GetShadowColor() ); + pDev->DrawLine(Point(aSlider.Left()+1,aSlider.Bottom()+1), Point(aSlider.Right()+1,aSlider.Bottom()+1)); + pDev->SetLineColor( rStyleSettings.GetDarkShadowColor() ); // draw snapping points: for ( std::vector< long >::const_iterator aSnappingPointIter = mxImpl->maSnappingPointOffsets.begin(), @@ -263,9 +269,6 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) nSnapPosX, aSlider.Bottom() + nSnappingHeight ) ); } - // draw slider - pDev->DrawRect( aSlider ); - // draw slider button Point aImagePoint = aRect.TopLeft(); aImagePoint.AdjustX(Zoom2Offset( mxImpl->mnCurrentZoom ) ); |