[gtk+] Revert "levelbar: Don't underallocate block widgets"
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "levelbar: Don't underallocate block widgets"
- Date: Tue, 8 Aug 2017 18:03:47 +0000 (UTC)
commit c25f619033ae981a26be136fe754fca93ad5f7a3
Author: Daniel Boles <dboles src gmail com>
Date: Tue Aug 8 18:58:13 2017 +0100
Revert "levelbar: Don't underallocate block widgets"
This reverts commit e25e1c54a44264de628fb3919fb47afd44e21ba5.
That commit causes a block always to be shown at the min side, even when
the value is 0, in which case, no fill should be shown.
https://bugzilla.gnome.org/show_bug.cgi?id=783649
gtk/gtklevelbar.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index 523b1f3..5092b09 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -430,7 +430,6 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
GtkAllocation block_area, clip;
gdouble fill_percentage;
gboolean inverted;
- int block_min;
inverted = gtk_level_bar_get_real_inverted (self);
@@ -446,13 +445,9 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
fill_percentage = (self->priv->cur_value - self->priv->min_value) /
(self->priv->max_value - self->priv->min_value);
- gtk_widget_measure (self->priv->block_widget[inverted ? 1 : 0], self->priv->orientation, -1,
- &block_min, NULL, NULL, NULL);
-
if (self->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
block_area.width = (gint) floor (block_area.width * fill_percentage);
- block_area.width = MAX (block_area.width, block_min);
if (inverted)
block_area.x += allocation->width - block_area.width;
@@ -460,7 +455,6 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
else
{
block_area.height = (gint) floor (block_area.height * fill_percentage);
- block_area.height = MAX (block_area.height, block_min);
if (inverted)
block_area.y += allocation->height - block_area.height;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]