summaryrefslogtreecommitdiffstats
path: root/framework/source
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-09-24 23:47:04 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-09-25 00:06:47 +0300
commita05b67585249b895a70e7fae89dc177e3aeaf57a (patch)
treee0c6ac5241c937d5a63978467793614f6060c09b /framework/source
parentshow correct command to execute the test (diff)
downloadcore-a05b67585249b895a70e7fae89dc177e3aeaf57a.tar.gz
core-a05b67585249b895a70e7fae89dc177e3aeaf57a.zip
tdf#102266 Try to keep HUD up to date
Recent HUD versions don't seem to support the activation callback, so we have to update menus in the background. (regression of 15436c009e756dd4c94046f9849ad5a186454af8) TODO: Is this manual iteration in GtkSalMenu::SetItemText worth it, or maybe simply calling Update() will be good enough, too? Change-Id: I7f08c3518e1767915d84036cdce7f678961595ef
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/uielement/menubarmanager.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index a7ed57273b88..c387d2ad1212 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -890,6 +890,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
if ( !bPopupMenu )
{
xMenuItemDispatch->addStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
+ // For the menubar, we have to keep status listening to support Ubuntu's HUD.
if ( !m_bHasMenuBar )
xMenuItemDispatch->removeStatusListener( static_cast< XStatusListener* >( this ), aTargetURL );
}