summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-07-06 17:54:43 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2015-07-06 17:58:05 +0300
commit1745af7d0a4157ce370d5ef2243f766bd28b6155 (patch)
tree93bf85f5cb556ced7b87311d8d49090c3f4c1c27 /framework
parent89cc8445f7f76b55e209b8c0c5407b0e592b1117 (diff)
Set button size before updating the images
So that the sub-toolbar controller will pick the right image size. Change-Id: I70b642ac84377b461a001ef11f551a5e1448c0f1
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ac021706db35..a6c0efd9a8c6 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -325,6 +325,8 @@ void ToolBarManager::RefreshImages()
SolarMutexGuard g;
bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
+ m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : TOOLBOX_BUTTONSIZE_SMALL );
+
for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
{
sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
@@ -355,7 +357,6 @@ void ToolBarManager::RefreshImages()
}
}
- m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : TOOLBOX_BUTTONSIZE_SMALL );
::Size aSize = m_pToolBar->CalcWindowSizePixel();
m_pToolBar->SetOutputSizePixel( aSize );
}