diff options
| author | Timm Bäder <mail@baedert.org> | 2017-05-03 10:19:29 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-19 21:27:10 -0400 |
| commit | 2b5458ccfab6be21516063f4dfed9367cecf8afb (patch) | |
| tree | 7fbb94244920f9d2ed804f552759498dc75fa272 /gtk/gtkprogressbar.c | |
| parent | 06950bcf8ac26ffb963493827cfad53cd0919888 (diff) | |
| download | gtk+-2b5458ccfab6be21516063f4dfed9367cecf8afb.tar.gz | |
progressbar: Remove css box drawing
Diffstat (limited to 'gtk/gtkprogressbar.c')
| -rw-r--r-- | gtk/gtkprogressbar.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 68ce01694a..0df4a53359 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -178,13 +178,6 @@ static void gtk_progress_bar_allocate (GtkCssGadget *gadget, gint baseline, GtkAllocation *out_clip, gpointer data); -static gboolean gtk_progress_bar_render (GtkCssGadget *gadget, - GtkSnapshot *snapshot, - gint x, - gint y, - gint width, - gint height, - gpointer data); G_DEFINE_TYPE_WITH_CODE (GtkProgressBar, gtk_progress_bar, GTK_TYPE_WIDGET, G_ADD_PRIVATE (GtkProgressBar) @@ -529,7 +522,7 @@ gtk_progress_bar_init (GtkProgressBar *pbar) GTK_WIDGET (pbar), gtk_progress_bar_measure, gtk_progress_bar_allocate, - gtk_progress_bar_render, + NULL, NULL, NULL); @@ -948,28 +941,6 @@ gtk_progress_bar_act_mode_leave (GtkProgressBar *pbar) update_node_classes (pbar); } -static gboolean -gtk_progress_bar_render (GtkCssGadget *gadget, - GtkSnapshot *snapshot, - int x, - int y, - int width, - int height, - gpointer data) -{ - GtkWidget *widget; - GtkProgressBarPrivate *priv; - - widget = gtk_css_gadget_get_owner (gadget); - priv = GTK_PROGRESS_BAR (widget)->priv; - - gtk_widget_snapshot_child (widget, priv->trough_widget, snapshot); - if (priv->show_text) - gtk_widget_snapshot_child (widget, priv->label, snapshot); - - return FALSE; -} - static void gtk_progress_bar_snapshot (GtkWidget *widget, GtkSnapshot *snapshot) @@ -977,7 +948,9 @@ gtk_progress_bar_snapshot (GtkWidget *widget, GtkProgressBar *pbar = GTK_PROGRESS_BAR (widget); GtkProgressBarPrivate *priv = pbar->priv; - gtk_css_gadget_snapshot (priv->gadget, snapshot); + gtk_widget_snapshot_child (widget, priv->trough_widget, snapshot); + if (priv->show_text) + gtk_widget_snapshot_child (widget, priv->label, snapshot); } static void |