diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-07 13:31:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-07 13:38:05 +0100 |
| commit | 10ee6a954671407d25d35d01c62657a367278e69 (patch) | |
| tree | 54ec2f06d79523a21f1ada6d2e1e60be8de345d8 | |
| parent | gtk3: wrongly activating the parent menu and not the desired child (diff) | |
| download | core-10ee6a954671407d25d35d01c62657a367278e69.tar.gz core-10ee6a954671407d25d35d01c62657a367278e69.zip | |
gtk3: move the updating of native menu to right after its activated
try fix that view->toolbars isn't in sync
Change-Id: I095be3003f076193878f2c3ce2a2be5acbe0e33f
(cherry picked from commit 15436c009e756dd4c94046f9849ad5a186454af8)
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 23178529682f..6d4792420798 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -480,8 +480,6 @@ throw ( RuntimeException, std::exception ) pMenuItemHandler->xMenuItemDispatch.clear(); } } - if ( m_bHasMenuBar && !m_bActive ) - m_pVCLMenu->UpdateNativeMenu(); } } diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 24ab3030e133..40b605221500 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -1025,6 +1025,7 @@ void GtkSalMenu::Activate(const gchar* pCommand) Menu* pVclMenu = pSalMenu->GetMenu(); Menu* pVclSubMenu = pVclMenu->GetPopupMenu(aMenuAndId.second); pTopLevel->GetMenu()->HandleMenuActivateEvent(pVclSubMenu); + pVclSubMenu->UpdateNativeMenu(); } void GtkSalMenu::Deactivate(const gchar* pCommand) |