mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

let menu button launch arbitrary floating windows

Browse Source 
and not just menus, this is like how the gtk equivalent can launch popovers

Change-Id: I53ae96aab0c51d75405dba15ab8080d7315471e3
This commit is contained in:
Caolán McNamara 2016-11-02 17:26:03 +00:00
parent 4f6028ad76
commit 4b7435e31a
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/vcl/menubtn.hxx
View File

@ -23,6 +23,7 @@
#include <vcl/button.hxx>
#include <vcl/dllapi.h>
class FloatingWindow;
class Timer;
class PopupMenu;
class VclBuilder;
@ -35,6 +36,7 @@ private:
Timer* mpMenuTimer;
VclPtr<PopupMenu> mpMenu;
VclPtr<FloatingWindow> mpFloatingWindow;
sal_uInt16 mnCurItemId;
bool mbDelayMenu;
Link<MenuButton*,void> maActivateHdl;
@ -70,9 +72,12 @@ public:
//before being shown
void SetDelayMenu(bool bDelay) { mbDelayMenu = bDelay; }
void SetPopupMenu( PopupMenu* pNewMenu );
void SetPopupMenu(PopupMenu* pNewMenu);
PopupMenu* GetPopupMenu() const { return mpMenu; }
void SetPopover(FloatingWindow* pFloatingWindow);
FloatingWindow* GetPopover() const { return mpFloatingWindow; }
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
OString GetCurItemIdent() const;

46
vcl/source/control/menubtn.cxx
View File

@ -20,6 +20,7 @@
#include <tools/rc.h>
#include <vcl/decoview.hxx>
#include <vcl/event.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/timer.hxx>
#include <vcl/menubtn.hxx>
@ -39,20 +40,29 @@ void MenuButton::ExecuteMenu()
{
Activate();
if ( mpMenu )
if (!mpMenu && !mpFloatingWindow)
return;
Size aSize = GetSizePixel();
SetPressed( true );
EndSelection();
if (mpMenu)
{
Point aPos( 0, 1 );
Size aSize = GetSizePixel();
Rectangle aRect( aPos, aSize );
SetPressed( true );
EndSelection();
mnCurItemId = mpMenu->Execute( this, aRect, PopupMenuFlags::ExecuteDown );
SetPressed( false );
if ( mnCurItemId )
{
Select();
mnCurItemId = 0;
}
Point aPos(0, 1);
Rectangle aRect(aPos, aSize );
mnCurItemId = mpMenu->Execute(this, aRect, PopupMenuFlags::ExecuteDown);
}
else
{
Point aPos(GetParent()->OutputToScreenPixel(GetPosPixel()));
Rectangle aRect(aPos, aSize );
mpFloatingWindow->StartPopupMode(aRect, FloatWinPopupFlags::Down | FloatWinPopupFlags::GrabFocus);
}
SetPressed(false);
if (mnCurItemId)
{
Select();
mnCurItemId = 0;
}
}
@ -152,7 +162,7 @@ void MenuButton::Select()
maSelectHdl.Call( this );
}
void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
void MenuButton::SetPopupMenu(PopupMenu* pNewMenu)
{
if (pNewMenu == mpMenu)
return;
@ -160,6 +170,14 @@ void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
mpMenu = pNewMenu;
}
void MenuButton::SetPopover(FloatingWindow* pFloatingWindow)
{
if (pFloatingWindow == mpFloatingWindow)
return;
mpFloatingWindow = pFloatingWindow;
}
//class MenuToggleButton ----------------------------------------------------
MenuToggleButton::MenuToggleButton( vcl::Window* pParent, WinBits nWinBits )