[gtk/gbsneto/rounded-stuff] widget: Consider border-radius when clipping and picking
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gbsneto/rounded-stuff] widget: Consider border-radius when clipping and picking
- Date: Sat, 9 Feb 2019 11:08:52 +0000 (UTC)
commit 45225f37e385ca759056fc71e9c6515e4e90ed80
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Feb 9 09:05:31 2019 -0200
widget: Consider border-radius when clipping and picking
When there is border-radius values applied to a given widget,
the simple rectangle test that is in place is not enough for
pick, and a simple rectangle clip is wrong as well.
Consider border-radius values when picking and clipping. When
picking, border-radius are checked even if overflow is visible
so that picked widget is always correct.
gtk/gtkwidget.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 109 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9207a46b1d..4a23451323 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -34,6 +34,7 @@
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkcontainerprivate.h"
+#include "gtkcsscornervalueprivate.h"
#include "gtkcssfiltervalueprivate.h"
#include "gtkcssfontvariationsvalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
@@ -4031,6 +4032,28 @@ get_number (GtkCssStyle *style,
return floor (d);
}
+static void
+get_corner (GtkCssStyle *style,
+ guint property,
+ gint *x,
+ gint *y)
+{
+ GtkCssValue *css_value = gtk_css_style_get_value (style, property);
+ double d;
+
+ if (x)
+ {
+ d = _gtk_css_corner_value_get_x (css_value, 100);
+ *x = d < 1.0 ? ceil (d) : floor (d);
+ }
+
+ if (y)
+ {
+ d = _gtk_css_corner_value_get_y (css_value, 100);
+ *y = d < 1.0 ? ceil (d) : floor (d);
+ }
+}
+
static void
get_box_margin (GtkCssStyle *style,
GtkBorder *margin)
@@ -4061,6 +4084,29 @@ get_box_padding (GtkCssStyle *style,
border->right = get_number (style, GTK_CSS_PROPERTY_PADDING_RIGHT);
}
+static void
+get_border_radius (GtkCssStyle *style,
+ gint *border_radius)
+{
+ get_corner (style, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS, &border_radius[0], &border_radius[1]);
+ get_corner (style, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS, &border_radius[2], &border_radius[3]);
+ get_corner (style, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS, &border_radius[4], &border_radius[5]);
+ get_corner (style, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS, &border_radius[6], &border_radius[7]);
+}
+
+static inline gboolean
+has_border_radius (gint *border_radius)
+{
+ return border_radius[0] != 0 ||
+ border_radius[1] != 0 ||
+ border_radius[2] != 0 ||
+ border_radius[3] != 0 ||
+ border_radius[4] != 0 ||
+ border_radius[5] != 0 ||
+ border_radius[6] != 0 ||
+ border_radius[7] != 0;
+}
+
/**
* gtk_widget_size_allocate:
* @widget: a #GtkWidget
@@ -11200,6 +11246,10 @@ gtk_widget_pick (GtkWidget *widget,
gdouble y)
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+ graphene_rect_t rect;
+ GtkBorder margin, border, padding;
+ GtkCssStyle *style;
+ gint border_radius[8];
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
@@ -11208,6 +11258,34 @@ gtk_widget_pick (GtkWidget *widget,
!_gtk_widget_is_drawable (widget))
return NULL;
+ style = gtk_css_node_get_style (priv->cssnode);
+ get_box_margin (style, &margin);
+ get_box_border (style, &border);
+ get_box_padding (style, &padding);
+ get_border_radius (style, border_radius);
+
+ rect = GRAPHENE_RECT_INIT (- padding.left,
+ - padding.top,
+ priv->allocation.width - margin.left - margin.right - border.left -
border.right,
+ priv->allocation.height - margin.top - margin.bottom - border.top -
border.bottom);
+
+
+ if (has_border_radius (border_radius))
+ {
+ GskRoundedRect rounded_rect;
+
+ gsk_rounded_rect_init (&rounded_rect,
+ &rect,
+ &GRAPHENE_SIZE_INIT (border_radius[0], border_radius[1]),
+ &GRAPHENE_SIZE_INIT (border_radius[2], border_radius[3]),
+ &GRAPHENE_SIZE_INIT (border_radius[4], border_radius[5]),
+ &GRAPHENE_SIZE_INIT (border_radius[6], border_radius[7]));
+
+ if (!gsk_rounded_rect_contains_point (&rounded_rect,
+ &GRAPHENE_POINT_INIT (x, y)))
+ return NULL;
+ }
+
switch (priv->overflow)
{
default:
@@ -11215,21 +11293,11 @@ gtk_widget_pick (GtkWidget *widget,
break;
case GTK_OVERFLOW_HIDDEN:
- {
- GtkBorder margin, border, padding;
- GtkCssStyle *style;
-
- style = gtk_css_node_get_style (priv->cssnode);
- get_box_margin (style, &margin);
- get_box_border (style, &border);
- get_box_padding (style, &padding);
-
- if (x < -padding.left ||
- y < -padding.top ||
- x >= priv->allocation.width - margin.left - margin.right - border.left - border.right -
padding.left ||
- y >= priv->allocation.height - margin.top - margin.bottom - border.top - border.bottom -
padding.top)
- return NULL;
- }
+ if (x < graphene_rect_get_x (&rect) ||
+ y < graphene_rect_get_y (&rect) ||
+ x >= graphene_rect_get_width (&rect) ||
+ y >= graphene_rect_get_height (&rect))
+ return NULL;
break;
}
@@ -13058,11 +13126,32 @@ gtk_widget_create_render_node (GtkWidget *widget,
if (priv->overflow == GTK_OVERFLOW_HIDDEN)
{
- gtk_snapshot_push_clip (snapshot,
- &GRAPHENE_RECT_INIT (- padding.left,
- - padding.top,
- allocation.width - margin.left - margin.right -
border.left - border.right,
- allocation.height - margin.top - margin.bottom -
border.top - border.bottom));
+ graphene_rect_t clip_rect;
+ gint border_radius[8];
+
+ clip_rect = GRAPHENE_RECT_INIT (- padding.left,
+ - padding.top,
+ allocation.width - margin.left - margin.right - border.left -
border.right,
+ allocation.height - margin.top - margin.bottom - border.top -
border.bottom);
+
+ get_border_radius (style, border_radius);
+ if (has_border_radius (border_radius))
+ {
+ GskRoundedRect rounded_clip_rect;
+
+ gsk_rounded_rect_init (&rounded_clip_rect,
+ &clip_rect,
+ &GRAPHENE_SIZE_INIT (border_radius[0], border_radius[1]),
+ &GRAPHENE_SIZE_INIT (border_radius[2], border_radius[3]),
+ &GRAPHENE_SIZE_INIT (border_radius[4], border_radius[5]),
+ &GRAPHENE_SIZE_INIT (border_radius[6], border_radius[7]));
+
+ gtk_snapshot_push_rounded_clip (snapshot, &rounded_clip_rect);
+ }
+ else
+ {
+ gtk_snapshot_push_clip (snapshot, &clip_rect);
+ }
}
klass->snapshot (widget, snapshot);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]