gimp r27369 - in branches/gimp-2-6: . plug-ins/print

[neo svn gnome org]

Author: neo
Date: Wed Oct 22 20:34:59 2008
New Revision: 27369
URL: http://svn.gnome.org/viewvc/gimp?rev=27369&view=rev

Log:
2008-10-22  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* plug-ins/print/print-preview.c 
(print_preview_leave_notify_event):
	check the crossing mode and don't unset the "inside" flag when 
the
	event is caused by a pointer grab/ungrab.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/plug-ins/print/print-preview.c

Modified: branches/gimp-2-6/plug-ins/print/print-preview.c
==============================================================================
--- branches/gimp-2-6/plug-ins/print/print-preview.c	(original)
+++ branches/gimp-2-6/plug-ins/print/print-preview.c	Wed Oct 22 20:34:59 2008
@@ -372,8 +372,7 @@
       if (preview->image_offset_x != offset_x ||
           preview->image_offset_y != offset_y)
         {
-          print_preview_set_image_offsets (preview,
-                                           offset_x, offset_y);
+          print_preview_set_image_offsets (preview, offset_x, offset_y);
 
           g_signal_emit (preview,
                          print_preview_signals[OFFSETS_CHANGED], 0,
@@ -397,7 +396,8 @@
 {
   PrintPreview *preview = PRINT_PREVIEW (widget);
 
-  print_preview_set_inside (preview, FALSE);
+  if (event->mode == GDK_CROSSING_NORMAL)
+    print_preview_set_inside (preview, FALSE);
 
   return FALSE;
 }
@@ -794,10 +794,12 @@
     case 3:
       format = CAIRO_FORMAT_RGB24;
       break;
+
     case 2:
     case 4:
       format = CAIRO_FORMAT_ARGB32;
       break;
+
     default:
       g_assert_not_reached ();
       break;