Commit 67e44e6a authored by Cosimo Cecchi's avatar Cosimo Cecchi

Revert "levelbar: start filling from the bottom"

This reverts commit 4b3ed75f.

I didn't see https://bugzilla.gnome.org/show_bug.cgi?id=684288 - it
makes more sense to properly fix this for the next cycle.
parent 4b3ed75f
......@@ -339,14 +339,9 @@ gtk_level_bar_draw_fill_continuous (GtkLevelBar *self,
(self->priv->max_value - self->priv->min_value);
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
block_area.width = (gint) floor (block_area.width * fill_percentage);
}
block_area.width = (gint) floor (block_area.width * fill_percentage);
else
{
block_area.height = (gint) floor (block_area.height * fill_percentage);
block_area.y += base_area.height - block_area.height;
}
block_area.height = (gint) floor (block_area.height * fill_percentage);
gtk_render_background (context, cr, block_area.x, block_area.y,
block_area.width, block_area.height);
......@@ -397,7 +392,6 @@ gtk_level_bar_draw_fill_discrete (GtkLevelBar *self,
{
block_draw_width = MAX (block_draw_width, block_area.width - block_margin.left - block_margin.right);
block_area.x += block_margin.left;
block_area.y += block_area.height - block_draw_height;
}
for (idx = 0; idx < num_blocks; idx++)
......@@ -405,7 +399,7 @@ gtk_level_bar_draw_fill_discrete (GtkLevelBar *self,
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
block_area.x += block_margin.left;
else
block_area.y -= block_margin.bottom;
block_area.y += block_margin.top;
if (idx > num_filled - 1)
gtk_style_context_add_class (context, STYLE_CLASS_EMPTY_FILL_BLOCK);
......@@ -420,7 +414,7 @@ gtk_level_bar_draw_fill_discrete (GtkLevelBar *self,
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
block_area.x += block_draw_width + block_margin.right;
else
block_area.y -= block_draw_height + block_margin.top;
block_area.y += block_draw_height + block_margin.bottom;
}
gtk_style_context_restore (context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment