AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

inspect-button: Remove custom pick() implementation

Browse Source 
This was added to work around the fact that pick() does not look at
insensitive widgets at all, but the replacement didn't properly work
either.
This commit is contained in:
Timm Bäder 2018-08-12 13:30:15 +02:00
parent 2bd02d9185
commit 7c020bfaaa
1 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk/inspector/inspect-button.c
View File

@ -37,49 +37,6 @@
#include "gtkeventcontrollermotion.h"
#include "gtkeventcontrollerkey.h"
static gboolean
inspector_contains (GtkWidget *widget,
double x,
double y)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (!gtk_widget_is_drawable (widget))
return FALSE;
return GTK_WIDGET_GET_CLASS (widget)->contains (widget, x, y);
}
static GtkWidget *
inspector_pick (GtkWidget *widget,
double x,
double y)
{
/* Like gtk_widget_pick and gtk_widget_contains,
* but we need to consider insensitive widgets as well. */
GtkWidget *child;
for (child = _gtk_widget_get_last_child (widget);
child;
child = _gtk_widget_get_prev_sibling (child))
{
GtkWidget *picked;
int dx, dy;
gtk_widget_get_origin_relative_to_parent (child, &dx, &dy);
picked = GTK_WIDGET_GET_CLASS (child)->pick (child, x - dx, y - dy);
if (picked)
return picked;
}
if (!inspector_contains (widget, x, y))
return NULL;
return widget;
}
static GtkWidget *
find_widget_at_pointer (GdkDevice *device)
{
@ -122,7 +79,7 @@ find_widget_at_pointer (GdkDevice *device)
gdk_surface_get_device_position_double (gtk_widget_get_surface (widget),
device, &x, &y, NULL);
widget = inspector_pick (widget, x, y);
widget = gtk_widget_pick (widget, x, y);
}
return widget;