diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-11-14 10:30:47 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-11-14 12:32:57 -0500 |
| commit | 93629325d52edd583e951f5921bcffe0f1c05e2e (patch) | |
| tree | bb65958d96964891b94e82c0d82c6416ae2329be /gtk/gtkviewport.c | |
| parent | debb33db8c5c2271f4f1cea8548ebe13fc6015c0 (diff) | |
| download | gtk+-93629325d52edd583e951f5921bcffe0f1c05e2e.tar.gz | |
Cosmetic: Avoid explicit state variables
Using the state of the context makes this more obviously correct.
Diffstat (limited to 'gtk/gtkviewport.c')
| -rw-r--r-- | gtk/gtkviewport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 6b8ac24d1b..93a1e9ed5a 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -1016,7 +1016,6 @@ gtk_viewport_get_preferred_size (GtkWidget *widget, GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; GtkStyleContext *context; - GtkStateFlags state; GtkBorder padding, border; GtkWidget *child; gint child_min, child_nat; @@ -1027,12 +1026,11 @@ gtk_viewport_get_preferred_size (GtkWidget *widget, minimum = 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); context = gtk_widget_get_style_context (GTK_WIDGET (widget)); - state = gtk_widget_get_state_flags (GTK_WIDGET (widget)); - gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding); if (priv->shadow_type != GTK_SHADOW_NONE) { - gtk_style_context_get_border (context, state, &border); + gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border); if (orientation == GTK_ORIENTATION_HORIZONTAL) { |