Kaydet (Commit) a8f9dd59 authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst c492cbe0
......@@ -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)
......
......@@ -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.
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment