From dcef110223e312d44955ca4aa1e2f306b9cb9e12 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sat, 11 Aug 2007 10:16:49 +0000
Subject: Embed/unembed the menu on state changes, keeping it around

cause some weird drawing issues.

Redraw on palette size changes (patch by Benzea).
---
(limited to 'lib')

diff --git a/lib/ui/sugar-menu.c b/lib/ui/sugar-menu.c
index d822867..f19dc4b 100644
--- a/lib/ui/sugar-menu.c
+++ b/lib/ui/sugar-menu.c
@@ -36,10 +36,21 @@ sugar_menu_set_active(SugarMenu *menu, gboolean active)
 void
 sugar_menu_embed(SugarMenu *menu, GtkContainer *parent)
 {
+    menu->orig_toplevel = GTK_MENU(menu)->toplevel;
+
     GTK_MENU(menu)->toplevel = gtk_widget_get_toplevel(GTK_WIDGET(parent));
     gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(parent));
 }
 
+void
+sugar_menu_unembed(SugarMenu *menu)
+{
+    if (menu->orig_toplevel) {
+        GTK_MENU(menu)->toplevel = menu->orig_toplevel;
+        gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(menu->orig_toplevel));
+    }
+}
+
 static void
 sugar_menu_class_init(SugarMenuClass *menu_class)
 {
@@ -48,4 +59,5 @@ sugar_menu_class_init(SugarMenuClass *menu_class)
 static void
 sugar_menu_init(SugarMenu *menu)
 {
+    menu->orig_toplevel = NULL;
 }
diff --git a/lib/ui/sugar-menu.h b/lib/ui/sugar-menu.h
index 05e2802..8773a31 100644
--- a/lib/ui/sugar-menu.h
+++ b/lib/ui/sugar-menu.h
@@ -35,8 +35,9 @@ typedef struct _SugarMenuClass SugarMenuClass;
 #define SUGAR_MENU_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_MENU, SugarMenuClass))
 
 struct _SugarMenu {
-	GtkMenu base_instance;
+    GtkMenu base_instance;
 
+    GtkWidget *orig_toplevel;
     int min_width;
 };
 
--
cgit v0.9.1