strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#133877 use optimal size for hamburger button

Browse source 
This way it'll properly scale, instead of using the fixed 28 pixel
dimension. This is a hack, which is used a few more times in VCL.
Still this should not be needed, but done automatically.
If there aren't any constraints, just return the optimal size!

Change-Id: I8aa32645ea95cba28d0daf56f0be27c15153b6c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96390
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2020-06-15 19:45:50 +02:00
parent 71b787473a
commit 0cdcaff700
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vcl/source/control/tabctrl.cxx
View file

@ -85,7 +85,6 @@ struct ImplTabCtrlData
// for the Tab positions
#define TAB_PAGERECT 0xFFFF
#define HAMBURGER_DIM 28
void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
@ -2192,9 +2191,9 @@ NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent)
, eLastContext(vcl::EnumContext::Context::Any)
{
m_pOpenMenu = VclPtr<PushButton>::Create( this , WB_CENTER | WB_VCENTER );
m_pOpenMenu->SetSizePixel(Size(HAMBURGER_DIM, HAMBURGER_DIM));
m_pOpenMenu->SetClickHdl(LINK(this, NotebookbarTabControlBase, OpenMenu));
m_pOpenMenu->SetModeImage(Image(StockImage::Yes, SV_RESID_BITMAP_NOTEBOOKBAR));
m_pOpenMenu->SetSizePixel(m_pOpenMenu->GetOptimalSize());
m_pOpenMenu->Show();
}
@ -2301,7 +2300,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
if (!m_pOpenMenu || m_pOpenMenu->isDisposed())
return false;
long nMaxWidth = nWidth - HAMBURGER_DIM;
const long nHamburgerWidth = m_pOpenMenu->GetSizePixel().Width();
long nMaxWidth = nWidth - nHamburgerWidth;
long nShortcutsWidth = m_pShortcuts != nullptr ? m_pShortcuts->GetSizePixel().getWidth() + 1 : 0;
long nFullWidth = nShortcutsWidth;
@ -2369,7 +2369,7 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
long nPosY = (m_nHeaderHeight - m_pOpenMenu->GetSizePixel().getHeight()) / 2;
// position the menu
m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, nPosY));
m_pOpenMenu->SetPosPixel(Point(nWidth - nHamburgerWidth, nPosY));
return true;
}