diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-24 00:40:56 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-24 11:36:04 +0200 |
| commit | b41deb2ef057c3bd43fa61448bb4d7299138c8d4 (patch) | |
| tree | a7d7cefba6336757ae46ff77b1f41764332d96c7 /framework/source | |
| parent | 49b5eed56c470975927bb7b0328337ab8a76a910 (diff) | |
Manually reset the active flag for popup menus
Change-Id: I942f42bbc43e041a7dae1e83663171c0f2978378
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 39ffad09ced6..f9e94bafa553 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1035,6 +1035,11 @@ IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool ) xDispatch->dispatch( aTargetURL, aArgs ); } + if ( !m_bHasMenuBar ) + // Standalone popup menu doesn't fire deactivate event in this case, + // so we have to reset the active flag here. + m_bActive = false; + return true; } |