gimp r25127 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Wed Mar 19 19:10:00 2008
New Revision: 25127
URL: http://svn.gnome.org/viewvc/gimp?rev=25127&view=rev

Log:
2008-03-19  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_expose): return FALSE so that the
	default drag highlighting works.

	* app/display/gimpdisplayshell-dnd.c: only set the canvas as 
drop
	target, not the whole shell.

	* app/display/gimpdisplayshell.c: delay the call to
	gimp_display_shell_dnd_init() until after the canvas has been
	created.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpcanvas.c
   trunk/app/display/gimpdisplayshell-callbacks.c
   trunk/app/display/gimpdisplayshell-dnd.c
   trunk/app/display/gimpdisplayshell.c

Modified: trunk/app/display/gimpcanvas.c
==============================================================================
--- trunk/app/display/gimpcanvas.c	(original)
+++ trunk/app/display/gimpcanvas.c	Wed Mar 19 19:10:00 2008
@@ -865,7 +865,8 @@
                          color->red   / 65535.0,
                          color->green / 65535.0,
                          color->blue  / 65535.0,
-                         0.1);
+                         0.2);
+
   pango_cairo_show_layout (cr, canvas->drop_zone_layout);
 }
 

Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c	(original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c	Wed Mar 19 19:10:00 2008
@@ -360,7 +360,7 @@
 
       cairo_destroy (cr);
 
-      return TRUE;
+      return FALSE;
     }
 
   /*  If the call to gimp_display_shell_pause() would cause a redraw,
@@ -428,7 +428,7 @@
 
   gimp_display_shell_resume (shell);
 
-  return TRUE;
+  return FALSE;
 }
 
 static void

Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c	(original)
+++ trunk/app/display/gimpdisplayshell-dnd.c	Wed Mar 19 19:10:00 2008
@@ -118,37 +118,37 @@
 {
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
 
-  gimp_dnd_uri_list_dest_add  (GTK_WIDGET (shell),
+  gimp_dnd_uri_list_dest_add  (GTK_WIDGET (shell->canvas),
                                gimp_display_shell_drop_uri_list,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_LAYER,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_LAYER,
                                gimp_display_shell_drop_drawable,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_LAYER_MASK,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_LAYER_MASK,
                                gimp_display_shell_drop_drawable,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_CHANNEL,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_CHANNEL,
                                gimp_display_shell_drop_drawable,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_VECTORS,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_VECTORS,
                                gimp_display_shell_drop_vectors,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_PATTERN,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_PATTERN,
                                gimp_display_shell_drop_pattern,
                                shell);
-  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell), GIMP_TYPE_BUFFER,
+  gimp_dnd_viewable_dest_add  (GTK_WIDGET (shell->canvas), GIMP_TYPE_BUFFER,
                                gimp_display_shell_drop_buffer,
                                shell);
-  gimp_dnd_color_dest_add     (GTK_WIDGET (shell),
+  gimp_dnd_color_dest_add     (GTK_WIDGET (shell->canvas),
                                gimp_display_shell_drop_color,
                                shell);
-  gimp_dnd_svg_dest_add       (GTK_WIDGET (shell),
+  gimp_dnd_svg_dest_add       (GTK_WIDGET (shell->canvas),
                                gimp_display_shell_drop_svg,
                                shell);
-  gimp_dnd_component_dest_add (GTK_WIDGET (shell),
+  gimp_dnd_component_dest_add (GTK_WIDGET (shell->canvas),
                                gimp_display_shell_drop_component,
                                shell);
-  gimp_dnd_pixbuf_dest_add    (GTK_WIDGET (shell),
+  gimp_dnd_pixbuf_dest_add    (GTK_WIDGET (shell->canvas),
                                gimp_display_shell_drop_pixbuf,
                                shell);
 }

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Wed Mar 19 19:10:00 2008
@@ -361,8 +361,6 @@
                     G_CALLBACK (gimp_display_shell_events),
                     shell);
 
-  gimp_display_shell_dnd_init (shell);
-
   gimp_help_connect (GTK_WIDGET (shell), gimp_standard_help_func,
                      GIMP_HELP_IMAGE_WINDOW, NULL);
 }
@@ -851,6 +849,7 @@
 
   shell->canvas = gimp_canvas_new (display->config);
 
+  gimp_display_shell_dnd_init (shell);
   gimp_display_shell_selection_init (shell);
 
   /*  the horizontal ruler  */