diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-26 16:32:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-26 18:59:15 +0000 |
| commit | a8f9dd59de4e655bc77fa0546b81440aee46b837 (patch) | |
| tree | b7b0634cf24083fe79616e5acc4ef414ef4dc540 | |
| parent | c492cbe08af160d17289716cc51721887e2c2afc (diff) | |
why would we ever want FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK
if we're from the menubar we never set it, but if we are
a submenu from a menu in the menubar we set it.
with it set, and on right click, the right click is passed
through to what ever is underneath the pointer
I don't see why we want to do that, especially the inconsistency
from e.g. the File menu, vs the "File->New" menu
Change-Id: I548f5c95e2511b5e921e8b74600f65eecdd8f498
| -rw-r--r-- | include/vcl/floatwin.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 5 |
3 files changed, 1 insertions, 8 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index d017b218901e..6f230e87dbed 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -44,7 +44,6 @@ class ToolBox; #define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uLong)0x00000800) #define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ((sal_uLong)0x00001000) #define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ((sal_uLong)0x00002000) -#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((sal_uLong)0x00004000) #define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x00008000) #define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((sal_uLong)0x00010000) #define FLOATWIN_POPUPMODE_GRABFOCUS ((sal_uLong)0x00020000) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 2890efbb28b8..f719d27d758c 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2870,9 +2870,6 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_ WinBits nStyle = WB_BORDER; if (bRealExecute) nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL; - if (!pStartedFrom || !pStartedFrom->IsMenuBar()) - nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK; - nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE; // could be useful during debugging. diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 83dc51682888..cb0f3e7e2863 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -145,10 +145,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) ) return true; pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); - if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) - return false; - else - return true; + return true; } else return true; |