diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-03-17 01:05:52 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-03-17 01:15:58 +0200 |
| commit | 1caac283894d0deeac564c67cd816cc2907f9ac7 (patch) | |
| tree | 8cd22177c2d52a09e25b54c52d342f0773c29283 /framework | |
| parent | e7d405b74e30218a85a1e1ec371c8175df06ded7 (diff) | |
tdf#92049 NewMenuController: track icon theme changes too
Change-Id: I2f2c990b2cbacddf94bf74329d641d5a7e489773
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/newmenucontroller.hxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 23b324b13e82..293101c40b56 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -96,6 +96,7 @@ namespace framework m_bNewMenu : 1, m_bModuleIdentified : 1, m_bAcceleratorCfg : 1; + OUString m_aIconTheme; OUString m_aTargetFrame; OUString m_aModuleIdentifier; OUString m_aEmptyDocURL; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index c48e66a055fb..5b997c1dcbc6 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -471,12 +471,14 @@ void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) thr { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); bool bShowImages( rSettings.GetUseImagesInMenus() ); + OUString aIconTheme( rSettings.DetermineIconTheme() ); PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu()); - if ( m_bShowImages != bShowImages ) + if ( m_bShowImages != bShowImages || m_aIconTheme != aIconTheme ) { m_bShowImages = bShowImages; + m_aIconTheme = aIconTheme; setMenuImages( pVCLPopupMenu, m_bShowImages ); } @@ -540,6 +542,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowImages = rSettings.GetUseImagesInMenus(); + m_aIconTheme = rSettings.DetermineIconTheme(); m_bNewMenu = m_aCommandURL == aSlotNewDocDirect; } } |