callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

levelbar: update css nodes even when no offset value is found

Browse Source 
GtkLevelBar supports adding custom offsets as style classes, and they
are applied whenever the :value property matches. The current code,
however, only updates any CSS nodes when an offset is found, causing
it to not update when a discrete value changes but no custom offset
is added.

Fix that by always updating the CSS nodes.

https://bugzilla.gnome.org/show_bug.cgi?id=773799
This commit is contained in:
Georges Basile Stavracas Neto 2016-11-02 00:46:10 -02:00 committed by Matthias Clasen
parent c5a9c0db80
commit b3e3946b2f
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtklevelbar.c
View File

@ -652,9 +652,12 @@ update_level_style_classes (GtkLevelBar *self)
{ {
GtkLevelBarPrivate *priv = self->priv; GtkLevelBarPrivate *priv = self->priv;
gdouble value; gdouble value;
const gchar *classes[3] = { NULL, NULL, NULL };
const gchar *value_class = NULL; const gchar *value_class = NULL;
GtkLevelBarOffset *offset, *prev_offset; GtkLevelBarOffset *offset, *prev_offset;
GList *l; GList *l;
gint num_filled, num_blocks, i;
gboolean inverted;
value = gtk_level_bar_get_value (self); value = gtk_level_bar_get_value (self);
@ -681,30 +684,23 @@ update_level_style_classes (GtkLevelBar *self)
break; break;
} }
if (value_class) inverted = gtk_level_bar_get_real_inverted (self);
{ num_blocks = gtk_level_bar_get_num_block_nodes (self);
const gchar *classes[3] = { NULL, NULL, NULL };
gint num_filled, num_blocks, i;
gboolean inverted;
inverted = gtk_level_bar_get_real_inverted (self); if (priv->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS)
num_blocks = gtk_level_bar_get_num_block_nodes (self); num_filled = 1;
else
num_filled = MIN (num_blocks, (gint) round (priv->cur_value) - (gint) round (priv->min_value));
if (priv->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS) classes[0] = "filled";
num_filled = 1; classes[1] = value_class;
else for (i = 0; i < num_filled; i++)
num_filled = MIN (num_blocks, (gint) round (priv->cur_value) - (gint) round (priv->min_value)); gtk_css_node_set_classes (gtk_css_gadget_get_node (priv->block_gadget[inverted ? num_blocks - 1 - i : i]), classes);
classes[0] = "filled"; classes[0] = "empty";
classes[1] = value_class; classes[1] = NULL;
for (i = 0; i < num_filled; i++) for (; i < num_blocks; i++)
gtk_css_node_set_classes (gtk_css_gadget_get_node (priv->block_gadget[inverted ? num_blocks - 1 - i : i]), classes); gtk_css_node_set_classes (gtk_css_gadget_get_node (priv->block_gadget[inverted ? num_blocks - 1 - i : i]), classes);
classes[0] = "empty";
classes[1] = NULL;
for (; i < num_blocks; i++)
gtk_css_node_set_classes (gtk_css_gadget_get_node (priv->block_gadget[inverted ? num_blocks - 1 - i : i]), classes);
}
} }
static void static void