diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-26 16:07:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-26 16:20:29 +0000 |
| commit | 4f9e20c46b616c7c51bae74bfefd5247f922b2a6 (patch) | |
| tree | f483914eb563ceb34befe94b593e307b155d51e2 | |
| parent | 473eae3a7d43ca13ef14eca844b991ffd143e3a0 (diff) | |
Resolves: fdo#84795 Menus don't disappear with right mouse click
Change-Id: I95ae2e2d564ec1c45de6df5158e4dec1d93053cb
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 74969b84898c..0121b618628c 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -3075,9 +3075,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) pGrandparentOutDev->ReMirror( aRect ); // mouse-button right: close the List-Box-Float-win and don't stop the handling fdo#84795 - const sal_uLong nFlags = FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE; - - StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | nFlags ); + StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ); if( nPos != LISTBOX_ENTRY_NOTFOUND ) mpImplLB->ShowProminentEntry( nPos ); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c7cfb4bae8a8..2890efbb28b8 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2871,9 +2871,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_ if (bRealExecute) nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL; if (!pStartedFrom || !pStartedFrom->IsMenuBar()) - nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE; + nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK; - nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE; + nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE; // could be useful during debugging. // nPopupModeFlags |= FLOATWIN_POPUPMODE_NOFOCUSCLOSE; |