[gtk/wip/exalm/levelbar] levelbar: Fill the whole space for discrete level bars
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/exalm/levelbar] levelbar: Fill the whole space for discrete level bars
- Date: Thu, 7 Oct 2021 10:48:36 +0000 (UTC)
commit 24f8d74b560cad8bf1978b3f54c05576dcb69b40
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Oct 7 15:05:09 2021 +0500
levelbar: Fill the whole space for discrete level bars
Ideally this would be using box layout, but it overrides measure() so it's
not possible - so reimplement it instead. Fix an accidentally int division
along the way.
gtk/gtklevelbar.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index 94e2e2b3d4..22b950067b 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -464,6 +464,7 @@ gtk_level_bar_allocate_trough_discrete (GtkLevelBar *self,
GtkAllocation block_area;
int num_blocks, i;
int block_width, block_height;
+ int extra_space;
gtk_level_bar_get_min_block_size (self, &block_width, &block_height);
num_blocks = gtk_level_bar_get_num_blocks (self);
@@ -473,13 +474,21 @@ gtk_level_bar_allocate_trough_discrete (GtkLevelBar *self,
if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- block_width = MAX (block_width, (int) floor (width / num_blocks));
+ block_width = MAX (block_width, (int) floor ((double) width / num_blocks));
block_height = height;
+ extra_space = width - block_width * num_blocks;
+
+ if (extra_space > 0)
+ block_width++;
}
else
{
block_width = width;
- block_height = MAX (block_height, (int) floor (height / num_blocks));
+ block_height = MAX (block_height, (int) floor ((double) height / num_blocks));
+ extra_space = height - block_height * num_blocks;
+
+ if (extra_space > 0)
+ block_height++;
}
block_area.x = 0;
@@ -489,6 +498,14 @@ gtk_level_bar_allocate_trough_discrete (GtkLevelBar *self,
for (i = 0; i < num_blocks; i++)
{
+ if (extra_space > 0 && i == extra_space)
+ {
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+ block_area.width--;
+ else
+ block_area.height--;
+ }
+
gtk_widget_size_allocate (self->block_widget[i],
&block_area,
baseline);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]