[gtk+/native-layout] Revert "Fixed GtkSpinner to request 12x12 at init time instead of at expose time."
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Revert "Fixed GtkSpinner to request 12x12 at init time instead of at expose time."
- Date: Wed, 23 Jun 2010 22:03:22 +0000 (UTC)
commit 99f73c09f6bb7aba3e491c3f6b44eed3734bf420
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Sun Jun 20 14:30:03 2010 -0400
Revert "Fixed GtkSpinner to request 12x12 at init time instead of at expose time."
This reverts commit 0dff033a648cb33f8f8d1ee3d31fabe43e0dcc10.
That commit was introduced as a workaround to an erronous state
in the extended layout work, it was not merged into master and
this new commit backs it out from native-layout branch.
gtk/gtkspinner.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 0f328ac..736b03f 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -211,8 +211,6 @@ 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);
}
@@ -222,9 +220,16 @@ 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]