From 3313fffcbb3c63fc541e7b3ead2430c6b9f8cb0d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 13 Dec 2008 08:19:48 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20563158=20=E2=80=93=20CellRendererProgress?= =?UTF-8?q?=20pulsing=20and=20progressing=20rows=20can=20not?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-12-13 Matthias Clasen Bug 563158 – CellRendererProgress pulsing and progressing rows can not be used together * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_pulse): Don't try to keep state in a cell renderer between two paint calls. It doesn't work. Patch by Kristian Mueller svn path=/branches/gtk-2-14/; revision=21891 --- ChangeLog | 11 +++++++++++ gtk/gtkcellrendererprogress.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5aeccdbdf..5c5f6166ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-12-13 Matthias Clasen + + Merged from trunk: + + Bug 563158 – CellRendererProgress pulsing and progressing rows can + not be used together + + * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_pulse): + Don't try to keep state in a cell renderer between two paint + calls. It doesn't work. Patch by Kristian Mueller + 2008-12-13 Matthias Clasen Merged from trunk: diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c index 4dc123d303..994b48d8b5 100644 --- a/gtk/gtkcellrendererprogress.c +++ b/gtk/gtkcellrendererprogress.c @@ -397,10 +397,10 @@ gtk_cell_renderer_progress_set_pulse (GtkCellRendererProgress *cellprogress, if (pulse != priv->pulse) { - if (priv->pulse <= 0) + if (pulse <= 0) priv->offset = 0; else - priv->offset++; + priv->offset = pulse; } priv->pulse = pulse;