Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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:28:25 -05:00
parent eca9549c72
commit 3007ad6f3b
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkprogressbar.c
View File

@@ -600,8 +600,7 @@ gtk_progress_bar_get_preferred_width (GtkWidget *widget,
{ {
GtkProgressBar *pbar; GtkProgressBar *pbar;
GtkProgressBarPrivate *priv; GtkProgressBarPrivate *priv;
GtkStyleContext *style_context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
gchar *buf; gchar *buf;
PangoRectangle logical_rect; PangoRectangle logical_rect;
@@ -612,9 +611,8 @@ gtk_progress_bar_get_preferred_width (GtkWidget *widget,
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
style_context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (style_context, state, &padding);
pbar = GTK_PROGRESS_BAR (widget); pbar = GTK_PROGRESS_BAR (widget);
priv = pbar->priv; priv = pbar->priv;
@@ -677,7 +675,6 @@ gtk_progress_bar_get_preferred_height (GtkWidget *widget,
GtkProgressBar *pbar; GtkProgressBar *pbar;
GtkProgressBarPrivate *priv; GtkProgressBarPrivate *priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
gchar *buf; gchar *buf;
PangoRectangle logical_rect; PangoRectangle logical_rect;
@@ -689,8 +686,7 @@ gtk_progress_bar_get_preferred_height (GtkWidget *widget,
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (context, state, &padding);
pbar = GTK_PROGRESS_BAR (widget); pbar = GTK_PROGRESS_BAR (widget);
priv = pbar->priv; priv = pbar->priv;
@@ -894,14 +890,12 @@ gtk_progress_bar_paint_activity (GtkProgressBar *pbar,
{ {
GtkProgressBarPrivate *priv = pbar->priv; GtkProgressBarPrivate *priv = pbar->priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
GtkWidget *widget = GTK_WIDGET (pbar); GtkWidget *widget = GTK_WIDGET (pbar);
GdkRectangle area; GdkRectangle area;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_save_to_node (context, priv->progress_node); gtk_style_context_save_to_node (context, priv->progress_node);
@@ -937,7 +931,6 @@ gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
{ {
GtkProgressBarPrivate *priv = pbar->priv; GtkProgressBarPrivate *priv = pbar->priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
GtkWidget *widget = GTK_WIDGET (pbar); GtkWidget *widget = GTK_WIDGET (pbar);
GdkRectangle area; GdkRectangle area;
@@ -946,8 +939,7 @@ gtk_progress_bar_paint_continuous (GtkProgressBar *pbar,
return; return;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_save_to_node (context, priv->progress_node); gtk_style_context_save_to_node (context, priv->progress_node);
@@ -992,7 +984,6 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
{ {
GtkProgressBarPrivate *priv = pbar->priv; GtkProgressBarPrivate *priv = pbar->priv;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
GtkWidget *widget = GTK_WIDGET (pbar); GtkWidget *widget = GTK_WIDGET (pbar);
gint x; gint x;
@@ -1004,8 +995,7 @@ gtk_progress_bar_paint_text (GtkProgressBar *pbar,
GdkRectangle prelight_clip, start_clip, end_clip; GdkRectangle prelight_clip, start_clip, end_clip;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (context, state, &padding);
buf = get_current_text (pbar); buf = get_current_text (pbar);
@@ -1122,14 +1112,12 @@ gtk_progress_bar_draw (GtkWidget *widget,
GtkOrientation orientation; GtkOrientation orientation;
gboolean inverted; gboolean inverted;
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
int width, height; int width, height;
int bar_width, bar_height; int bar_width, bar_height;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
gtk_style_context_get_padding (context, state, &padding);
orientation = priv->orientation; orientation = priv->orientation;
inverted = priv->inverted; inverted = priv->inverted;