diff options
| author | Armin Le Grand <alg@apache.org> | 2013-01-23 16:06:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-13 21:00:33 +0100 |
| commit | 6c9b376b2dc9007f1cb48a189f3020a1b82937fd (patch) | |
| tree | 347618eeddf60bc3444370c5eed392dd8d4ec814 /sc | |
| parent | 0061af795047deb92c4b43ec191ad6ffd97d0b64 (diff) | |
Resolves: #i121532# unified getting the blended selection color
(cherry picked from commit dd4bed5d1151db2a45dbbfe9eff61875f8f4835d)
Conflicts:
svtools/inc/svtools/optionsdrawinglayer.hxx
svtools/source/config/optionsdrawinglayer.cxx
sw/source/core/crsr/viscrs.cxx
Change-Id: I21167b58a9b81f5fa15c7def5fb4b6023f91f32b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4a5c9b522947..244a7319ad3d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5542,25 +5542,9 @@ void ScGridWindow::UpdateSelectionOverlay() aRanges.push_back(aRB); } - // #i97672# get the system's hilight color and limit it to the maximum - // allowed luminance. This is needed to react on too bright hilight colors - // which would otherwise vive a bad visualisation - Color aHighlight(GetSettings().GetStyleSettings().GetHighlightColor()); + // get the system's hilight color const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; - const basegfx::BColor aSelection(aHighlight.getBColor()); - const double fLuminance(aSelection.luminance()); - const double fMaxLum(aSvtOptionsDrawinglayer.GetSelectionMaximumLuminancePercent() / 100.0); - - if(fLuminance > fMaxLum) - { - const double fFactor(fMaxLum / fLuminance); - const basegfx::BColor aNewSelection( - aSelection.getRed() * fFactor, - aSelection.getGreen() * fFactor, - aSelection.getBlue() * fFactor); - - aHighlight = Color(aNewSelection); - } + const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor()); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( sdr::overlay::OVERLAY_TRANSPARENT, |