gtk+ r21167 - trunk/gtk

[federico svn gnome org]

Author: federico
Date: Wed Aug 20 01:12:54 2008
New Revision: 21167
URL: http://svn.gnome.org/viewvc/gtk+?rev=21167&view=rev

Log:
[PATCH 6/7] bgo543308 - Only compute a font-based size if we are in expanded mode or one of the OPEN modes

Signed-off-by: Federico Mena Quintero <federico novell com>

Modified:
   trunk/gtk/gtkfilechooserdefault.c

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Wed Aug 20 01:12:54 2008
@@ -7806,21 +7806,33 @@
   GtkRequisition req;
 
   impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
-  find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
 
-  if (impl->preview_widget_active &&
-      impl->preview_widget &&
-      GTK_WIDGET_VISIBLE (impl->preview_widget))
-    {
-      gtk_widget_size_request (impl->preview_box, &req);
-      *default_width += PREVIEW_HBOX_SPACING + req.width;
-    }
+  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+      || impl->expand_folders)
+    {
+      find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
+
+      if (impl->preview_widget_active &&
+	  impl->preview_widget &&
+	  GTK_WIDGET_VISIBLE (impl->preview_widget))
+	{
+	  gtk_widget_size_request (impl->preview_box, &req);
+	  *default_width += PREVIEW_HBOX_SPACING + req.width;
+	}
 
-  if (impl->extra_widget &&
-      GTK_WIDGET_VISIBLE (impl->extra_widget))
+      if (impl->extra_widget &&
+	  GTK_WIDGET_VISIBLE (impl->extra_widget))
+	{
+	  gtk_widget_size_request (impl->extra_align, &req);
+	  *default_height += GTK_BOX (chooser_embed)->spacing + req.height;
+	}
+    }
+  else
     {
-      gtk_widget_size_request (impl->extra_align, &req);
-      *default_height += GTK_BOX (chooser_embed)->spacing + req.height;
+      gtk_widget_size_request (GTK_WIDGET (impl), &req);
+      *default_width = req.width;
+      *default_height = req.height;
     }
 }