AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

Make progressbars render progress again

Browse Source 
This was broken during some earlier deprecation cleanup.
Bug 620509.
This commit is contained in:
Christian Dywan 2010-06-04 20:03:19 -04:00 committed by Matthias Clasen
parent db21688908
commit 35be520983
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkprogressbar.c
View File

@ -968,6 +968,8 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar); priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
priv->fraction = fraction; 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"); 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)); 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. */ /* Sigh. */
gtk_progress_set_activity_mode (GTK_PROGRESS (pbar), TRUE);
gtk_progress_bar_real_update (GTK_PROGRESS (pbar)); 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); priv = GTK_PROGRESS_BAR_GET_PRIVATE (pbar);
g_free (priv->text); g_free (priv->text);
priv->text = text && *text ? g_strdup (text) : NULL; 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"); g_object_notify (G_OBJECT (pbar), "text");
} }