[gtk+/native-layout] Fixed GtkSpinner to request 12x12 at init time instead of at expose time.



commit 0dff033a648cb33f8f8d1ee3d31fabe43e0dcc10
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Apr 18 20:46:30 2010 -0400

    Fixed GtkSpinner to request 12x12 at init time instead of at expose time.
    
    This should not change the space taken by the spinner when hidden,
    and it should only set the minimum size not the actual size (i.e. code
    in place was conditionally setting it if not allocated 12x12, which
    doesnt really make sense)... This fixes spinners showing at the correct size
    in gtk-demo.

 gtk/gtkspinner.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 736b03f..0f328ac 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -211,6 +211,8 @@ gtk_spinner_init (GtkSpinner *spinner)
 
   spinner->priv = priv;
 
+  gtk_widget_set_size_request (GTK_WIDGET (spinner), 12, 12);
+
   gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
 }
 
@@ -220,16 +222,9 @@ gtk_spinner_expose (GtkWidget      *widget,
 {
   GtkStateType state_type;
   GtkSpinnerPrivate *priv;
-  int width, height;
 
   priv = GTK_SPINNER (widget)->priv;
 
-  width = widget->allocation.width;
-  height = widget->allocation.height;
-
-  if ((width < 12) || (height <12))
-    gtk_widget_set_size_request (widget, 12, 12);
-
   state_type = GTK_STATE_NORMAL;
   if (!gtk_widget_is_sensitive (widget))
    state_type = GTK_STATE_INSENSITIVE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]