diff options
| author | Christian Dywan <christian@lanedoedo.com> | 2010-06-04 20:03:19 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-06-04 20:03:19 -0400 |
| commit | 35be520983dd19d0688cdd0a9821394758ccdc75 (patch) | |
| tree | 4011657823055ef0c4e3dc623e5ac3e9d710db67 | |
| parent | db2168890834e3284de64b6a1a08f88417feda31 (diff) | |
| download | gtk+-35be520983dd19d0688cdd0a9821394758ccdc75.tar.gz | |
Make progressbars render progress again
This was broken during some earlier deprecation cleanup.
Bug 620509.
| -rw-r--r-- | gtk/gtkprogressbar.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 6af35a40c7..0274f62221 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -968,6 +968,8 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar, priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar); priv->fraction = fraction; + gtk_progress_set_activity_mode (GTK_PROGRESS (pbar), FALSE); + gtk_progress_set_percentage (GTK_PROGRESS (pbar), fraction); g_object_notify (G_OBJECT (pbar), "fraction"); } @@ -987,11 +989,8 @@ gtk_progress_bar_pulse (GtkProgressBar *pbar) { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); - GTK_PROGRESS_GET_CLASS (pbar)->act_mode_enter (GTK_PROGRESS (pbar)); - if (gtk_widget_is_drawable (GTK_WIDGET (pbar))) - gtk_widget_queue_resize (GTK_WIDGET (pbar)); - /* Sigh. */ + gtk_progress_set_activity_mode (GTK_PROGRESS (pbar), TRUE); gtk_progress_bar_real_update (GTK_PROGRESS (pbar)); } @@ -1013,6 +1012,9 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar, priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar); g_free (priv->text); priv->text = text && *text ? g_strdup (text) : NULL; + gtk_progress_set_show_text (GTK_PROGRESS (pbar), text && *text); + gtk_progress_set_format_string (GTK_PROGRESS (pbar), text); + GTK_PROGRESS (pbar)->use_text_format = (text == NULL); g_object_notify (G_OBJECT (pbar), "text"); } |