diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-25 16:54:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-29 12:34:29 +0200 |
commit | 94762fbc8dcb3b7fe6d535374915db7e7ab95937 (patch) | |
tree | d32a6b25794ba87f8dca29ea5765d4596a4f757c /cui/source/dialogs | |
parent | 096692d397b086775d68a29a905d8883184b70a4 (diff) |
weld SvxAngleTabPage
Change-Id: I03bd0a6a0805d549570ce44030a0f58ca2b98d05
Reviewed-on: https://gerrit.libreoffice.org/54987
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 4fba23b2f7ca..3b182cde641a 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -426,7 +426,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) void ColorFieldControl::MouseButtonDown(const MouseEvent& rMEvt) { - grab_add(); + CaptureMouse(); mbMouseCaptured = true; ShowPosition(rMEvt.GetPosPixel(), true); Modify(); @@ -443,7 +443,7 @@ void ColorFieldControl::MouseMove(const MouseEvent& rMEvt) void ColorFieldControl::MouseButtonUp(const MouseEvent&) { - grab_remove(); + ReleaseMouse(); mbMouseCaptured = false; } @@ -537,14 +537,12 @@ private: VclPtr<VirtualDevice> mxBitmap; sal_Int16 mnLevel; double mdValue; - bool mbMouseCaptured; }; ColorSliderControl::ColorSliderControl() : meMode( DefaultMode ) , mnLevel( 0 ) , mdValue( -1.0 ) - , mbMouseCaptured(false) { } @@ -651,15 +649,14 @@ void ColorSliderControl::ChangePosition(long nY) void ColorSliderControl::MouseButtonDown(const MouseEvent& rMEvt) { - grab_add(); - mbMouseCaptured = true; + CaptureMouse(); ChangePosition(rMEvt.GetPosPixel().Y()); Modify(); } void ColorSliderControl::MouseMove(const MouseEvent& rMEvt) { - if (mbMouseCaptured) + if (IsMouseCaptured()) { ChangePosition(rMEvt.GetPosPixel().Y()); Modify(); @@ -668,8 +665,7 @@ void ColorSliderControl::MouseMove(const MouseEvent& rMEvt) void ColorSliderControl::MouseButtonUp(const MouseEvent&) { - grab_remove(); - mbMouseCaptured = false; + ReleaseMouse(); } void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) |