SF.net SVN: geany:[5781] branches/0.20.1

[colombanw at users.sourceforge.net]

Revision: 5781
          http://geany.svn.sourceforge.net/geany/?rev=5781&view=rev
Author:   colombanw
Date:     2011-05-09 17:36:59 +0000 (Mon, 09 May 2011)

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

Modified Paths:
--------------
    branches/0.20.1/ChangeLog
    branches/0.20.1/src/toolbar.c

Modified: branches/0.20.1/ChangeLog
===================================================================
--- branches/0.20.1/ChangeLog	2011-05-09 17:36:39 UTC (rev 5780)
+++ branches/0.20.1/ChangeLog	2011-05-09 17:36:59 UTC (rev 5781)
@@ -8,6 +8,9 @@
    When sorting tags by line, also sort by scope if line is the same, avoiding
    wrong sorting if a parent tag is on the same line than its children, and one
    of it's children would be sorted before alphabetically (closes #3193982).
+ * src/toolbar.c:
+   Correctly expand the menubar if the toolbar is appended to it but
+   not visible (closes #3204955).
 
 
 2011-05-08  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: branches/0.20.1/src/toolbar.c
===================================================================
--- branches/0.20.1/src/toolbar.c	2011-05-09 17:36:39 UTC (rev 5780)
+++ branches/0.20.1/src/toolbar.c	2011-05-09 17:36:59 UTC (rev 5781)
@@ -479,7 +479,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.