SF.net SVN: geany:[5585] trunk

[colombanw at users.sourceforge.net]

Revision: 5585
          http://geany.svn.sourceforge.net/geany/?rev=5585&view=rev
Author:   colombanw
Date:     2011-03-10 16:05:29 +0000 (Thu, 10 Mar 2011)

Log Message:
-----------
Correctly expand the menubar if the toolbar is appended to it but not visible (closes #3204955)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/toolbar.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-08 20:19:01 UTC (rev 5584)
+++ trunk/ChangeLog	2011-03-10 16:05:29 UTC (rev 5585)
@@ -1,3 +1,10 @@
+2011-03-10  Colomban Wendling  <colomban(at)geany(dot)org>
+
+ * src/toolbar.c:
+   Correctly expand the menubar if the toolbar is appended to it but
+   not visible (closes #3204955).
+
+
 2011-03-08  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/geany.h:

Modified: trunk/src/toolbar.c
===================================================================
--- trunk/src/toolbar.c	2011-03-08 20:19:01 UTC (rev 5584)
+++ trunk/src/toolbar.c	2011-03-10 16:05:29 UTC (rev 5585)
@@ -480,7 +480,8 @@
 	/* we need to adjust the packing flags for the menubar to expand it if it is alone in the
 	 * hbox and not expand it if the toolbar is appended */
 	gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar,
-		! toolbar_prefs.append_to_menu, ! toolbar_prefs.append_to_menu, 0, GTK_PACK_START);
+		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu),
+		! (toolbar_prefs.visible && toolbar_prefs.append_to_menu), 0, GTK_PACK_START);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.