dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 780375 - Color picker won't pick on Wayland 

In GimpPickButton, try to pick from the local window under the
cursor, before falling back to picking from the root window, so
that we can at least pick from local windows on Wayland.
This commit is contained in:
Ell 2017-10-31 11:13:44 -04:00
parent 0f716b3357
commit 0323541d86
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libgimpwidgets/gimppickbutton-default.c
View File

@ -234,17 +234,35 @@ gimp_pick_button_pick (GdkScreen *screen,
#else
GdkWindow *root_window = gdk_screen_get_root_window (screen);
GdkWindow *window;
gint x_window;
gint y_window;
cairo_surface_t *image;
cairo_t *cr;
guchar *data;
guchar color[3];
/* we try to pick from the local window under the cursor, and fall back to
* picking from the root window if this fails (i.e., if the cursor is not
* under a local window). on wayland, picking from the root window is not
* supported, so this at least allows us to pick from local windows. see
* bug #780375.
*/
window = gdk_display_get_window_at_pointer (gdk_screen_get_display (screen),
&x_window, &y_window);
if (! window)
{
window = gdk_screen_get_root_window (screen);
x_window = x_root;
y_window = y_root;
}
image = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 1, 1);
cr = cairo_create (image);
gdk_cairo_set_source_window (cr, root_window, -x_root, -y_root);
gdk_cairo_set_source_window (cr, window, -x_window, -y_window);
cairo_paint (cr);
cairo_destroy (cr);