SF.net SVN: geany: [1432] trunk

[ntrel at users.sourceforge.net]

Revision: 1432
          http://svn.sourceforge.net/geany/?rev=1432&view=rev
Author:   ntrel
Date:     2007-03-30 09:34:51 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Prevent Find in Files directory combo being vertically stretched.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-30 11:25:53 UTC (rev 1431)
+++ trunk/ChangeLog	2007-03-30 16:34:51 UTC (rev 1432)
@@ -3,6 +3,8 @@
  * geany.desktop.in:
    Added MimeTypes: C++ header, Pascal, Perl, Python, httpd-PHP, XML;
    thanks to Iñaki Rodriguez.
+ * src/search.c:
+   Prevent Find in Files directory combo being vertically stretched.
 
 
 2007-03-30  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2007-03-30 11:25:53 UTC (rev 1431)
+++ trunk/src/search.c	2007-03-30 16:34:51 UTC (rev 1432)
@@ -559,7 +559,7 @@
 	if (widgets.find_in_files_dialog == NULL)
 	{
 		GtkWidget *label, *label1, *checkbox1, *checkbox2, *check_wholeword;
-		GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox;
+		GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox, *box;
 		GtkSizeGroup *size_group;
 		GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips"));
 
@@ -583,6 +583,10 @@
 		g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "dir_combo",
 						gtk_widget_ref(dir_combo), (GDestroyNotify)gtk_widget_unref);
 
+		// prevent dir_combo being vertically stretched to the height of dirbtn
+		box = gtk_vbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(box), dir_combo, TRUE, FALSE, 0);
+
 		dirbtn = gtk_button_new();
 		openimg = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 		gtk_container_add(GTK_CONTAINER(dirbtn), openimg);
@@ -591,7 +595,7 @@
 
 		dbox = gtk_hbox_new(FALSE, 6);
 		gtk_box_pack_start(GTK_BOX(dbox), label1, FALSE, FALSE, 0);
-		gtk_box_pack_start(GTK_BOX(dbox), dir_combo, TRUE, TRUE, 0);
+		gtk_box_pack_start(GTK_BOX(dbox), box, TRUE, TRUE, 0);
 		gtk_box_pack_start(GTK_BOX(dbox), dirbtn, FALSE, FALSE, 0);
 
 		label = gtk_label_new(_("Search for:"));


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