summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorGökhan Gurbetoğlu <gokhan.gurbetoglu@pardus.org.tr>2017-07-03 19:07:21 +0300
committerSzymon Kłos <szymon.klos@collabora.com>2017-08-14 20:29:13 +0200
commit16b3a46ce0c94f7dfba8d391dd48ee82ba0f1d0f (patch)
treecb9690d26dedd2aee7f965fe010c944b587a9c0d /sfx2
parent3b8db1ebc98d4a4ec54fd7be4ebc3aedc97b9f21 (diff)
Creating a button for the hamburger menu
Things done in this commit: - Created a hamburger menu button on the right. - Moved the opening menu to match the new hamburger button. - Added 1 pixel at the end of shortcut toolbox so no overlapping with the tabs would occur. Change-Id: I3d05eec72e260575563e4d016945af0777541cfb Reviewed-on: https://gerrit.libreoffice.org/38450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/notebookbar/NotebookbarTabControl.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index bd6c147b87c5..87c05ae9179c 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -130,6 +130,7 @@ public:
NotebookbarTabControl::NotebookbarTabControl( Window* pParent )
: NotebookbarTabControlBase( pParent )
+, m_pListener( nullptr )
, m_bInitialized( false )
, m_bInvalidate( true )
{
@@ -255,7 +256,7 @@ IMPL_LINK(NotebookbarTabControl, OpenNotebookbarPopupMenu, NotebookBar*, pNotebo
xPopupController->setPopupMenu(xPopupMenu);
VCLXMenu* pAwtMenu = VCLXMenu::GetImplementation(xPopupMenu);
PopupMenu* pVCLMenu = static_cast<PopupMenu*>(pAwtMenu->GetMenu());
- Point aPos(0, NotebookbarTabControl::GetHeaderHeight());
+ Point aPos(pNotebookbar->GetSizePixel().getWidth(), NotebookbarTabControl::GetHeaderHeight() - ICON_SIZE + 10);
pVCLMenu->Execute(pNotebookbar, tools::Rectangle(aPos, aPos),PopupMenuFlags::ExecuteDown|PopupMenuFlags::NoMouseUpClose);
Reference<css::lang::XComponent> xComponent(xPopupController, UNO_QUERY);