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

enable drags from and disable drops to the ColorArea in the color_info 

2001-01-15  Sven Neumann  <sven@gimp.org>

        * app/color_picker.c: enable drags from and disable drops to
        the ColorArea in the color_info dialog. Changed the cursor_update
        function so it only displays the bad cursor when outside the image.
This commit is contained in:
Sven Neumann 2001-01-15 19:30:42 +00:00 committed by Sven Neumann
parent 0ab27c8bf2
commit 7e4c298080
3 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-15 Sven Neumann <sven@gimp.org>
* app/color_picker.c: enable drags from and disable drops to
the ColorArea in the color_info dialog. Changed the cursor_update
function so it only displays the bad cursor when outside the image.
2001-01-15 Michael Natterer <mitch@gimp.org> 2001-01-15 Michael Natterer <mitch@gimp.org>
* app/devices.c * app/devices.c

40
app/color_picker.c
View File

@ -312,9 +312,14 @@ color_picker_button_press (Tool *tool,
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0); gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
color_area = gimp_color_area_new (&color, color_area =
gimp_drawable_has_alpha (tool->drawable) ? GIMP_COLOR_AREA_LARGE_CHECKS : GIMP_COLOR_AREA_FLAT, 0); gimp_color_area_new (&color,
gtk_widget_set_usize (GTK_WIDGET (color_area), 48, 64); gimp_drawable_has_alpha (tool->drawable) ?
GIMP_COLOR_AREA_LARGE_CHECKS :
GIMP_COLOR_AREA_FLAT,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK);
gtk_widget_set_usize (color_area, 48, 64);
gtk_drag_dest_unset (color_area);
gtk_container_add (GTK_CONTAINER (frame), color_area); gtk_container_add (GTK_CONTAINER (frame), color_area);
gtk_widget_show (color_area); gtk_widget_show (color_area);
gtk_widget_show (frame); gtk_widget_show (frame);
@ -445,16 +450,27 @@ color_picker_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y,
FALSE, FALSE); FALSE, FALSE);
if (gimp_image_pick_correlate_layer (gdisp->gimage, x, y)) /* We used to use the following code here:
gdisplay_install_tool_cursor (gdisp, GIMP_COLOR_PICKER_CURSOR, *
COLOR_PICKER, * if (gimp_image_pick_correlate_layer (gdisp->gimage, x, y)) { ... }
CURSOR_MODIFIER_NONE, */
FALSE);
if (gdisp->gimage &&
x > 0 && x < gdisp->gimage->width &&
y > 0 && y < gdisp->gimage->height)
{
gdisplay_install_tool_cursor (gdisp, GIMP_COLOR_PICKER_CURSOR,
COLOR_PICKER,
CURSOR_MODIFIER_NONE,
FALSE);
}
else else
gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR, {
COLOR_PICKER, gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR,
CURSOR_MODIFIER_NONE, COLOR_PICKER,
FALSE); CURSOR_MODIFIER_NONE,
FALSE);
}
} }
static void static void

40
app/tools/color_picker.c
View File

@ -312,9 +312,14 @@ color_picker_button_press (Tool *tool,
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0); gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
color_area = gimp_color_area_new (&color, color_area =
gimp_drawable_has_alpha (tool->drawable) ? GIMP_COLOR_AREA_LARGE_CHECKS : GIMP_COLOR_AREA_FLAT, 0); gimp_color_area_new (&color,
gtk_widget_set_usize (GTK_WIDGET (color_area), 48, 64); gimp_drawable_has_alpha (tool->drawable) ?
GIMP_COLOR_AREA_LARGE_CHECKS :
GIMP_COLOR_AREA_FLAT,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK);
gtk_widget_set_usize (color_area, 48, 64);
gtk_drag_dest_unset (color_area);
gtk_container_add (GTK_CONTAINER (frame), color_area); gtk_container_add (GTK_CONTAINER (frame), color_area);
gtk_widget_show (color_area); gtk_widget_show (color_area);
gtk_widget_show (frame); gtk_widget_show (frame);
@ -445,16 +450,27 @@ color_picker_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y,
FALSE, FALSE); FALSE, FALSE);
if (gimp_image_pick_correlate_layer (gdisp->gimage, x, y)) /* We used to use the following code here:
gdisplay_install_tool_cursor (gdisp, GIMP_COLOR_PICKER_CURSOR, *
COLOR_PICKER, * if (gimp_image_pick_correlate_layer (gdisp->gimage, x, y)) { ... }
CURSOR_MODIFIER_NONE, */
FALSE);
if (gdisp->gimage &&
x > 0 && x < gdisp->gimage->width &&
y > 0 && y < gdisp->gimage->height)
{
gdisplay_install_tool_cursor (gdisp, GIMP_COLOR_PICKER_CURSOR,
COLOR_PICKER,
CURSOR_MODIFIER_NONE,
FALSE);
}
else else
gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR, {
COLOR_PICKER, gdisplay_install_tool_cursor (gdisp, GIMP_BAD_CURSOR,
CURSOR_MODIFIER_NONE, COLOR_PICKER,
FALSE); CURSOR_MODIFIER_NONE,
FALSE);
}
} }
static void static void