diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-02-23 13:42:55 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-27 22:18:22 +0100 |
commit | cfe41185bc8514949d1938ee1d7cd56968682510 (patch) | |
tree | 8d990aae964cf0ed6ed49c06a86133057481ae7d /cui | |
parent | 3e1306c283c2aca372a8384801a1e206f208e1cb (diff) |
weld LicenseDialogImpl
Change-Id: I4b2dbd2446779e7179d2b79bf81cc2ff879377bf
Reviewed-on: https://gerrit.libreoffice.org/68389
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 30 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuigrfflt.hxx | 2 |
3 files changed, 22 insertions, 14 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index ffb214140e35..4587f52660cc 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -208,9 +208,9 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; - virtual void MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void MouseMove(const MouseEvent& rMEvt) override; - virtual void MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; void UpdateBitmap(); void ShowPosition( const Point& rPos, bool bUpdate ); @@ -418,27 +418,30 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) } } -void ColorFieldControl::MouseButtonDown(const MouseEvent& rMEvt) +bool ColorFieldControl::MouseButtonDown(const MouseEvent& rMEvt) { CaptureMouse(); mbMouseCaptured = true; ShowPosition(rMEvt.GetPosPixel(), true); Modify(); + return true; } -void ColorFieldControl::MouseMove(const MouseEvent& rMEvt) +bool ColorFieldControl::MouseMove(const MouseEvent& rMEvt) { if (mbMouseCaptured) { ShowPosition(rMEvt.GetPosPixel(), true); Modify(); } + return true; } -void ColorFieldControl::MouseButtonUp(const MouseEvent&) +bool ColorFieldControl::MouseButtonUp(const MouseEvent&) { ReleaseMouse(); mbMouseCaptured = false; + return true; } void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) @@ -507,9 +510,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual void MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void MouseMove(const MouseEvent& rMEvt) override; - virtual void MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual void Resize() override; @@ -641,25 +644,28 @@ void ColorSliderControl::ChangePosition(long nY) mdValue = double(nHeight - nY) / double(nHeight); } -void ColorSliderControl::MouseButtonDown(const MouseEvent& rMEvt) +bool ColorSliderControl::MouseButtonDown(const MouseEvent& rMEvt) { CaptureMouse(); ChangePosition(rMEvt.GetPosPixel().Y()); Modify(); + return true; } -void ColorSliderControl::MouseMove(const MouseEvent& rMEvt) +bool ColorSliderControl::MouseMove(const MouseEvent& rMEvt) { if (IsMouseCaptured()) { ChangePosition(rMEvt.GetPosPixel().Y()); Modify(); } + return true; } -void ColorSliderControl::MouseButtonUp(const MouseEvent&) +bool ColorSliderControl::MouseButtonUp(const MouseEvent&) { ReleaseMouse(); + return true; } void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 02e93b287074..fe1d523b6874 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -396,7 +396,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double return aRet; } -void EmbossControl::MouseButtonDown( const MouseEvent& rEvt ) +bool EmbossControl::MouseButtonDown( const MouseEvent& rEvt ) { const RectPoint eOldRP = GetActualRP(); @@ -404,6 +404,8 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt ) if( GetActualRP() != eOldRP ) maModifyHdl.Call( nullptr ); + + return true; } void EmbossControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 396cfeb82ecd..31b51ca47a44 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -157,7 +157,7 @@ class EmbossControl : public SvxRectCtl { private: Link<LinkParamNone*, void> maModifyHdl; - virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual bool MouseButtonDown( const MouseEvent& rEvt ) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; public: EmbossControl() |