Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scale: Don't apply borders twice for value

Browse Source 
The measured size of the range already includes borders that the scale
calculates. This includes the drawn value. So in the measurement of
scale, the size of the value shouldn't just be added to the size of the
scale, as then the size is effectively added twice.

To fix this, we first measure the minimum size of the range. Then, we
determine the minimum size of our scale. Only then do we set the minimum
size to maximum of those two values.
This commit is contained in:
Matthijs Velsink
2024-08-25 22:59:22 +02:00
parent 8ca299e82b
commit d58b545ffb
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkscale.c
View File

@@ -1436,11 +1436,12 @@ gtk_scale_measure (GtkWidget *widget,
GtkScale *scale = GTK_SCALE (widget);
GtkScalePrivate *priv = gtk_scale_get_instance_private (scale);
GtkOrientation scale_orientation;
int range_minimum, range_natural, scale_minimum = 0, scale_natural = 0;
GTK_WIDGET_CLASS (gtk_scale_parent_class)->measure (widget,
orientation,
for_size,
minimum, natural,
&range_minimum, &range_natural,
minimum_baseline, natural_baseline);
scale_orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
@@ -1462,8 +1463,8 @@ gtk_scale_measure (GtkWidget *widget,
marks_size = MAX (top_marks_size, bottom_marks_size);
*minimum = MAX (*minimum, marks_size);
*natural = MAX (*natural, marks_size);
scale_minimum = MAX (scale_minimum, marks_size);
scale_natural = MAX (scale_natural, marks_size);
}
if (priv->value_widget)
@@ -1477,29 +1478,32 @@ gtk_scale_measure (GtkWidget *widget,
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
*minimum = MAX (*minimum, min);
*natural = MAX (*natural, nat);
scale_minimum = MAX (scale_minimum, min);
scale_natural = MAX (scale_natural, nat);
}
else
{
*minimum += min;
*natural += nat;
scale_minimum += min;
scale_natural += nat;
}
}
else
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
*minimum += min;
*natural += nat;
scale_minimum += min;
scale_natural += nat;
}
else
{
*minimum = MAX (*minimum, min);
*natural = MAX (*natural, nat);
scale_minimum = MAX (scale_minimum, min);
scale_natural = MAX (scale_natural, nat);
}
}
}
*minimum = MAX (range_minimum, scale_minimum);
*natural = MAX (range_natural, scale_natural);
}
static void