AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic: Avoid explicit state variables

Browse Source 
Using the state of the context makes this more obviously correct.
This commit is contained in:
Matthias Clasen 2015-11-14 10:30:47 -05:00
parent debb33db8c
commit 93629325d5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkviewport.c
View File

@ -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)
{