[gtk/wip/matthiasc/css-values: 4/8] Speed up gtk_widget_pick
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/css-values: 4/8] Speed up gtk_widget_pick
- Date: Mon, 13 Jan 2020 19:51:39 +0000 (UTC)
commit 6a0275f26f43cd5349dd8fc19e2c885f2f3a2b30
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 12 19:36:53 2020 -0500
Speed up gtk_widget_pick
Add early exits, and avoid as much work as
possible.
gtk/gtkwidget.c | 55 +++++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 76de31262a..b3ede410b5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10476,6 +10476,25 @@ gtk_widget_contains (GtkWidget *widget,
return GTK_WIDGET_GET_CLASS (widget)->contains (widget, x, y);
}
+/* do the checks for gtk_widget_pick that do not depend on position */
+static gboolean
+gtk_widget_can_be_picked (GtkWidget *widget,
+ GtkPickFlags flags)
+{
+ if (!_gtk_widget_is_drawable (widget))
+ return FALSE;
+
+ if (!(flags & GTK_PICK_NON_TARGETABLE) &&
+ !gtk_widget_get_can_target (widget))
+ return FALSE;
+
+ if (!(flags & GTK_PICK_INSENSITIVE) &&
+ !_gtk_widget_is_sensitive (widget))
+ return FALSE;
+
+ return TRUE;
+}
+
/**
* gtk_widget_pick:
* @widget: the widget to query
@@ -10507,37 +10526,18 @@ gtk_widget_pick (GtkWidget *widget,
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
GtkWidget *child;
+ GtkCssBoxes boxes;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
- if (!_gtk_widget_is_drawable (widget))
- return NULL;
-
- if (!(flags & GTK_PICK_NON_TARGETABLE) &&
- !gtk_widget_get_can_target (widget))
- return NULL;
-
- if (!(flags & GTK_PICK_INSENSITIVE) &&
- !_gtk_widget_is_sensitive (widget))
+ if (!gtk_widget_can_be_picked (widget, flags))
return NULL;
- switch (priv->overflow)
+ if (priv->overflow == GTK_OVERFLOW_HIDDEN)
{
- default:
- case GTK_OVERFLOW_VISIBLE:
- break;
-
- case GTK_OVERFLOW_HIDDEN:
- {
- GtkCssBoxes boxes;
+ gtk_css_boxes_init (&boxes, widget);
- gtk_css_boxes_init (&boxes, widget);
-
- if (!gsk_rounded_rect_contains_point (gtk_css_boxes_get_padding_box (&boxes),
- &GRAPHENE_POINT_INIT (x, y)))
- return NULL;
- }
- break;
+ if (!gsk_rounded_rect_contains_point (gtk_css_boxes_get_padding_box (&boxes),
+ &GRAPHENE_POINT_INIT (x, y)))
+ return NULL;
}
if (GTK_IS_WINDOW (widget))
@@ -10559,6 +10559,9 @@ gtk_widget_pick (GtkWidget *widget,
GtkWidget *picked;
graphene_point3d_t p0, p1, res;
+ if (!gtk_widget_can_be_picked (child, flags))
+ continue;
+
if (GTK_IS_NATIVE (child))
continue;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]