Fix various theme bugs

git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1191 b067294f-1dea-0310-9683-c47a78595994

4 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0efdfc5..4401ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-15  Ross Burton  <ross@burtonini.com>
+
+	* src/main.c:
+	* src/callbacks.c:
+	* src/fakedev.h:
+	Various fixes for themeing.  Set the size of the fixed widget not
+	the window so the image doesn't get clipped by the size of the
+	menu bar, and hide the menu bar when turning off decorations.
+	
 2005-01-28  mallum,,,  <mallum@openedhand.com>
 
 	* src/Makefile.am:
diff --git a/src/callbacks.c b/src/callbacks.c
index db06546..073cc68 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -78,12 +78,14 @@ on_show_decorations_toggle (GtkCheckMenuItem * menuitem, FakeApp * app)
       gtk_widget_realize (app->window);
       gdk_window_shape_combine_mask (app->window->window, mask, 0, 0);
 
+      gtk_widget_hide (app->menubar);
       gtk_window_set_decorated (GTK_WINDOW (app->window), FALSE);
       gtk_check_menu_item_set_active (menuitem, FALSE);
     }
   else
     {
       gdk_window_shape_combine_mask (app->window->window, NULL, 0, 0);
+      gtk_widget_show (app->menubar);
       gtk_window_set_decorated (GTK_WINDOW (app->window), TRUE);
       gtk_check_menu_item_set_active (menuitem, TRUE);
     }
diff --git a/src/fakedev.h b/src/fakedev.h
index c1d4823..b231768 100644
--- a/src/fakedev.h
+++ b/src/fakedev.h
@@ -36,6 +36,7 @@ typedef struct FakeButton FakeButton;
 struct FakeApp
 {
   GtkWidget *window;
+  GtkWidget *menubar;
   GtkWidget *fixed;
   GtkWidget *winnest;
   GtkWidget *popupmenu;
diff --git a/src/main.c b/src/main.c
index 3c130d0..af2ec86 100644
--- a/src/main.c
+++ b/src/main.c
@@ -97,6 +97,7 @@ fakeapp_new (void)
 #endif
 
   app->window = glade_xml_get_widget (glade, "window");
+  app->menubar = glade_xml_get_widget (glade, "menubar");
   app->fixed = glade_xml_get_widget (glade, "fixed");
   gtk_fixed_set_has_window (GTK_FIXED (app->fixed), TRUE);
 
@@ -140,7 +141,7 @@ fakeapp_create_gui (FakeApp * app)
 
   /* Configure the main window title and size */
   gtk_window_set_title (GTK_WINDOW (app->window), app->win_title);
-  gtk_widget_set_size_request (app->window, app->device_width,
+  gtk_widget_set_size_request (app->fixed, app->device_width,
 			       app->device_height);
 
   /* Move and set the size of the window for the Xnest. */