diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-12-16 13:16:16 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-12-16 13:53:13 -0500 |
| commit | 4e05148befb73a253d957ccb0449e7252b470886 (patch) | |
| tree | ba2467ea65661ac00a85f1bf16762a88b19f9597 | |
| parent | 3f7eefb922811430c0c04671f15a02c15592fd8c (diff) | |
| download | gtk+-4e05148befb73a253d957ccb0449e7252b470886.tar.gz | |
Simplify some code
Deal with the min-width/min-height fallback the same way
as in GtkBuiltinIcon.
| -rw-r--r-- | gtk/gtkprogressbar.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 587fad542e..509f73217e 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -835,23 +835,21 @@ gtk_progress_bar_measure_trough (GtkCssGadget *gadget, gpointer data) { GtkWidget *widget; - GtkProgressBar *pbar; GtkProgressBarPrivate *priv; GtkCssStyle *style; widget = gtk_css_gadget_get_owner (gadget); - pbar = GTK_PROGRESS_BAR (widget); - priv = pbar->priv; + priv = GTK_PROGRESS_BAR (widget)->priv; style = gtk_css_gadget_get_style (gadget); if (orientation == GTK_ORIENTATION_HORIZONTAL) { - gint min_width; + gdouble min_width; - min_width = get_number (style, GTK_CSS_PROPERTY_MIN_WIDTH); + min_width = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_MIN_WIDTH), 100.0); - if (min_width != 0) - *minimum = min_width; + if (min_width > 0.0) + *minimum = 0; else if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) gtk_widget_style_get (widget, "min-horizontal-bar-width", minimum, NULL); else @@ -859,12 +857,12 @@ gtk_progress_bar_measure_trough (GtkCssGadget *gadget, } else { - gint min_height; + gdouble min_height; - min_height = get_number (style, GTK_CSS_PROPERTY_MIN_HEIGHT); + min_height = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_MIN_HEIGHT), 100.0); - if (min_height != 0) - *minimum = min_height; + if (min_height > 0.0) + *minimum = 0; else if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) gtk_widget_style_get (widget, "min-horizontal-bar-height", minimum, NULL); else |