Rebuild labels for menu items when detaching/attaching menus (which c…

…auses the menus to loose them).

Fixes issue #66.

radiant/gtkmisc.cpp

@@ -761,12 +761,23 @@ GtkWidget* menu_separator (GtkWidget *menu)
   return menu_item;
 }
 
+/*
+mfn: rebuild menu shown menu item bindings whenever a menu is
+deatached/attached as it looses the values.
+*/
+static void tearoff_state_changed (GtkMenu *menu, GParamSpec *pspec, gpointer data)
+{
+	g_pParentWnd->UpdateMenuItemBindings();
+}
+
 GtkWidget* menu_tearoff (GtkWidget *menu)
 {
   GtkWidget *menu_item = gtk_tearoff_menu_item_new ();
   gtk_menu_append (GTK_MENU (menu), menu_item);
 // gtk_widget_set_sensitive (menu_item, FALSE); -- controls whether menu is detachable
   gtk_widget_show (menu_item);
+  // listen to this signal to rebuild the bindings shown to the menu items
+  g_signal_connect_after(menu, "notify::tearoff-state", G_CALLBACK(tearoff_state_changed), menu_item);
   return menu_item;
 }
 

radiant/mainframe.cpp

@@ -8079,7 +8079,21 @@ void MainFrame::OnFilterWorld()
   Sys_UpdateWindows (W_XY|W_CAMERA);
 }
 
+/*
+mfn: this is part of a workaround to have the bindings shown *after* a menu has been detached/attached.
+Since ShowMenuItemKeyBindings() directly modified the access_label, this is information gets
+lost when a menu is detached. In menu_tearoff() we listen to the notify::tearoff-state signal
+and whenever it changes, this method gets called to rebuild them.
+
+TODO: this rebuilds all bindings for all commands. Would be nice if it just updates the
+bindings for the menu being detached/attached.
 
+See also http://github.com/mfn/GtkRadiant/issues#issue/66 for more details.
+*/
+void MainFrame::UpdateMenuItemBindings()
+{
+	ShowMenuItemKeyBindings(m_pWidget);
+}
 
 
 

radiant/mainframe.h

@@ -908,6 +908,7 @@ class MainFrame
   void OnFilterClusterportals();
   void OnFilterLightgrid();
   void OnSelectFuncGroup();
+  void UpdateMenuItemBindings();
 
 private:
   EViewStyle m_nCurrentStyle;