diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 09:16:39 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-18 17:36:43 +0100 |
commit | 9a21a3295c57f5692c5cf9b14f7342138a38e3db (patch) | |
tree | 164dc6a3f071b989e2e072b8839fe8568128747b /desktop | |
parent | Resolves: tdf#128104 Input Engine events are delivered via Command (diff) | |
download | core-9a21a3295c57f5692c5cf9b14f7342138a38e3db.tar.gz core-9a21a3295c57f5692c5cf9b14f7342138a38e3db.zip |
Related: tdf#128104 extend popup handler to cover all CommandEvents
Reviewed-on: https://gerrit.libreoffice.org/80021
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 947150821e985c255f6c802322e696eff4257a5d)
Change-Id: I26360ce5c696d0e571385d83a15876eb2286e12f
Reviewed-on: https://gerrit.libreoffice.org/82741
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index a3c1f554e586..c3dbe95890cb 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -117,7 +117,7 @@ public: void InitFromDialog(ExtMgrDialog *pParentDialog); virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual bool ContextMenu( const CommandEvent& rCEvt ) override; + virtual bool Command( const CommandEvent& rCEvt ) override; virtual void RecalcAll() override; virtual void selectEntry( const long nPos ) override; @@ -214,10 +214,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry) } } -bool ExtBoxWithBtns_Impl::ContextMenu(const CommandEvent& rCEvt) +bool ExtBoxWithBtns_Impl::Command(const CommandEvent& rCEvt) { if (rCEvt.GetCommand() != CommandEventId::ContextMenu) - return false; + return ExtensionBox_Impl::Command(rCEvt); const Point aMousePos(rCEvt.GetMousePosPixel()); const auto nPos = PointToPos(aMousePos); |