callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic: Avoid explicit state variables

Browse Source 
Fold it into its single user.
This commit is contained in:
Matthias Clasen
2015-11-14 10:28:54 -05:00
parent 3007ad6f3b
commit 6c5d08d75a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkrange.c
View File

@ -1935,7 +1935,6 @@ gtk_range_draw (GtkWidget *widget,
{ {
GtkRange *range = GTK_RANGE (widget); GtkRange *range = GTK_RANGE (widget);
GtkRangePrivate *priv = range->priv; GtkRangePrivate *priv = range->priv;
GtkStateFlags widget_state;
gboolean draw_trough = TRUE; gboolean draw_trough = TRUE;
gboolean draw_slider = TRUE; gboolean draw_slider = TRUE;
GtkStyleContext *context; GtkStyleContext *context;
@ -1958,8 +1957,6 @@ gtk_range_draw (GtkWidget *widget,
gtk_range_calc_marks (range); gtk_range_calc_marks (range);
gtk_range_calc_layout (range); gtk_range_calc_layout (range);
widget_state = gtk_widget_get_state_flags (widget);
/* Just to be confusing, we draw the trough for the whole /* Just to be confusing, we draw the trough for the whole
* range rectangle, not the trough rectangle (the trough * range rectangle, not the trough rectangle (the trough
* rectangle is just for hit detection) * rectangle is just for hit detection)
@ -2140,7 +2137,8 @@ gtk_range_draw (GtkWidget *widget,
} }
} }
if (!(widget_state & GTK_STATE_FLAG_INSENSITIVE) && gtk_widget_has_visible_focus (widget)) if (!(gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE) &&
gtk_widget_has_visible_focus (widget))
{ {
gtk_render_focus (context, cr, gtk_render_focus (context, cr,
priv->range_rect.x, priv->range_rect.x,