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

fixed color picking from other screens. 

2003-08-19  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimppickbutton.c: fixed color picking from other
	screens.
This commit is contained in:
Sven Neumann 2003-08-18 23:21:44 +00:00 committed by Sven Neumann
parent 43ed2b38be
commit 180aacb96b
2 changed files with 14 additions and 6 deletions

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-08-19 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimppickbutton.c: fixed color picking from other
screens.
2003-08-18 Manish Singh <yosh@gimp.org>
* plug-ins/pygimp/gimpmodule.c: updated for new gradient sample API,

15
libgimpwidgets/gimppickbutton.c
View File

@ -60,7 +60,7 @@ static gboolean gimp_pick_button_mouse_release (GtkWidget *invisible,
GdkEventButton *event,
GimpPickButton *button);
static void gimp_pick_button_shutdown (GimpPickButton *button);
static void gimp_pick_button_grab (GtkWidget *invisible,
static void gimp_pick_button_pick (GdkScreen *screen,
gint x_root,
gint y_root,
GimpPickButton *button);
@ -342,7 +342,8 @@ gimp_pick_button_mouse_motion (GtkWidget *invisible,
GdkEventMotion *event,
GimpPickButton *button)
{
gimp_pick_button_grab (invisible, event->x_root, event->y_root, button);
gimp_pick_button_pick (gdk_event_get_screen ((GdkEvent *) event),
event->x_root, event->y_root, button);
return TRUE;
}
@ -355,7 +356,8 @@ gimp_pick_button_mouse_release (GtkWidget *invisible,
if (event->button != 1)
return FALSE;
gimp_pick_button_grab (invisible, event->x_root, event->y_root, button);
gimp_pick_button_pick (gdk_event_get_screen ((GdkEvent *) event),
event->x_root, event->y_root, button);
gimp_pick_button_shutdown (button);
@ -379,18 +381,19 @@ gimp_pick_button_shutdown (GimpPickButton *button)
}
static void
gimp_pick_button_grab (GtkWidget *invisible,
gimp_pick_button_pick (GdkScreen *screen,
gint x_root,
gint y_root,
GimpPickButton *button)
{
GdkColormap *colormap = gdk_screen_get_system_colormap (screen);
GdkWindow *root_window = gdk_screen_get_root_window (screen);
GdkImage *image;
guint32 pixel;
GdkColormap *colormap = gdk_colormap_get_system ();
GdkColor color;
GimpRGB rgb;
image = gdk_drawable_get_image (GDK_DRAWABLE (gdk_get_default_root_window ()),
image = gdk_drawable_get_image (GDK_DRAWABLE (root_window),
x_root, y_root, 1, 1);
pixel = gdk_image_get_pixel (image, 0, 0);
g_object_unref (image);