diff options
| author | Timm Bäder <mail@baedert.org> | 2016-10-22 16:06:14 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2016-10-22 19:05:47 +0200 |
| commit | 9992a616efa47205ac16ed8be255eda5e7aadf6c (patch) | |
| tree | 3879538642de33a77472bafe3e6e8afea3b3e343 /gtk/gtkprogressbar.c | |
| parent | 6525b95e2502080c08b65317c910204c2b6125da (diff) | |
| download | gtk+-9992a616efa47205ac16ed8be255eda5e7aadf6c.tar.gz | |
widget: Use ::measure vfunc to measure size
Add a new ::measure vfunc similar to GtkCssGadget's that widget
implementations have to override instead of the old get_preferred_width,
get_preferred_height, get_preferred_width_for_height,
get_preferred_height_for_width and
get_preferred_height_and_baseline_for_width.
Diffstat (limited to 'gtk/gtkprogressbar.c')
| -rw-r--r-- | gtk/gtkprogressbar.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 7056a31550..d42f7f48e1 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -150,12 +150,6 @@ static void gtk_progress_bar_get_property (GObject *object, GParamSpec *pspec); static void gtk_progress_bar_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static void gtk_progress_bar_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural); -static void gtk_progress_bar_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural); static gboolean gtk_progress_bar_draw (GtkWidget *widget, cairo_t *cr); @@ -169,6 +163,13 @@ static void gtk_progress_bar_direction_changed (GtkWidget *widget, static void gtk_progress_bar_state_flags_changed (GtkWidget *widget, GtkStateFlags previous_state); +static void gtk_progress_bar_measure_ (GtkWidget *widget, + GtkOrientation orientation, + gint for_size, + gint *minimum, + gint *natural, + gint *minimum_baseline, + gint *natural_baseline); static void gtk_progress_bar_measure (GtkCssGadget *gadget, GtkOrientation orientation, gint for_size, @@ -236,8 +237,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class) widget_class->draw = gtk_progress_bar_draw; widget_class->size_allocate = gtk_progress_bar_size_allocate; - widget_class->get_preferred_width = gtk_progress_bar_get_preferred_width; - widget_class->get_preferred_height = gtk_progress_bar_get_preferred_height; + widget_class->measure = gtk_progress_bar_measure_; widget_class->direction_changed = gtk_progress_bar_direction_changed; widget_class->state_flags_changed = gtk_progress_bar_state_flags_changed; @@ -914,28 +914,21 @@ gtk_progress_bar_allocate_trough (GtkCssGadget *gadget, gtk_css_gadget_allocate (priv->progress_gadget, &alloc, -1, out_clip); } -static void -gtk_progress_bar_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - gtk_css_gadget_get_preferred_size (GTK_PROGRESS_BAR (widget)->priv->gadget, - GTK_ORIENTATION_HORIZONTAL, - -1, - minimum, natural, - NULL, NULL); -} static void -gtk_progress_bar_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) +gtk_progress_bar_measure_ (GtkWidget *widget, + GtkOrientation orientation, + int for_size, + int *minimum, + int *natural, + int *minimum_baseline, + int *natural_baseline) { gtk_css_gadget_get_preferred_size (GTK_PROGRESS_BAR (widget)->priv->gadget, - GTK_ORIENTATION_VERTICAL, - -1, + orientation, + for_size, minimum, natural, - NULL, NULL); + minimum_baseline, natural_baseline); } static gboolean |