]> Pileus Git - ~andy/gtk/commitdiff
accellabel: Only daw accelerator after natural size has been reached
authorBenjamin Otte <otte@redhat.com>
Sun, 1 May 2011 06:00:50 +0000 (08:00 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 1 May 2011 06:02:15 +0000 (08:02 +0200)
gtk/gtkaccellabel.c

index 167e6033d1dab810040e9a49f6aabe71c780e7df..07e88204549d867b8c63e9d305ad6074be88fc12 100644 (file)
@@ -386,9 +386,9 @@ gtk_accel_label_draw (GtkWidget *widget,
   direction = gtk_widget_get_direction (widget);
   ac_width = gtk_accel_label_get_accel_width (accel_label);
   gtk_widget_get_allocation (widget, &allocation);
-  gtk_widget_get_preferred_size (widget, &requisition, NULL);
+  gtk_widget_get_preferred_size (widget, NULL, &requisition);
 
-  if (allocation.width >= requisition.width + ac_width)
+  if (allocation.width >= requisition.width + ac_width && FALSE)
     {
       GtkStyleContext *context;
       PangoLayout *label_layout;