[gtk+/gtk-3-20] range: Ensure we don't underallocate the highlight gadget
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-20] range: Ensure we don't underallocate the highlight gadget
- Date: Tue, 6 Sep 2016 12:18:28 +0000 (UTC)
commit 6dd558a183761a7d2763b4f7d94b119527851ef3
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Sep 4 09:43:51 2016 -0400
range: Ensure we don't underallocate the highlight gadget
This was causing warnings in HighContrast.
https://bugzilla.gnome.org/show_bug.cgi?id=770614
gtk/gtkrange.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 1790c60..a5f920d 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1986,33 +1986,43 @@ gtk_range_allocate_trough (GtkCssGadget *gadget,
if (priv->has_origin)
{
GtkAllocation highlight_alloc, highlight_clip;
+ int min, nat;
+
+ gtk_css_gadget_get_preferred_size (priv->highlight_gadget,
+ priv->orientation, -1,
+ &min, &nat,
+ NULL, NULL);
highlight_alloc = *allocation;
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
+ int x = slider_alloc.x + slider_alloc.width / 2;
+
if (!should_invert (range))
{
highlight_alloc.x = allocation->x;
- highlight_alloc.width = slider_alloc.x + slider_alloc.width / 2 - allocation->x;
+ highlight_alloc.width = MAX (x - allocation->x, min);
}
else
{
- highlight_alloc.x = slider_alloc.x + slider_alloc.width / 2;
- highlight_alloc.width = allocation->x + allocation->width - highlight_alloc.x;
+ highlight_alloc.width = MAX (allocation->x + allocation->width - x, min);
+ highlight_alloc.x = allocation->x + allocation->width - highlight_alloc.width;
}
}
else
{
+ int y = slider_alloc.y + slider_alloc.height / 2;
+
if (!should_invert (range))
{
highlight_alloc.y = allocation->y;
- highlight_alloc.height = slider_alloc.y + slider_alloc.height / 2 - allocation->y;
+ highlight_alloc.height = MAX (y - allocation->y, min);
}
else
{
- highlight_alloc.y = slider_alloc.y + slider_alloc.height / 2;
- highlight_alloc.height = allocation->y + allocation->height - highlight_alloc.y;
+ highlight_alloc.height = MAX (allocation->y + allocation->height - y, min);
+ highlight_alloc.y = allocation->y + allocation->height - highlight_alloc.height;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]