gimp r26739 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Sun Aug 24 08:05:07 2008
New Revision: 26739
URL: http://svn.gnome.org/viewvc/gimp?rev=26739&view=rev

Log:
2008-08-24  Martin Nordholts  <martinn svn gnome org>

	* app/display/gimpnavigationeditor.c
	(gimp_navigation_editor_popup): Correct the positioning
	calculation (while still retaining current overall behaviour).


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpnavigationeditor.c

Modified: trunk/app/display/gimpnavigationeditor.c
==============================================================================
--- trunk/app/display/gimpnavigationeditor.c	(original)
+++ trunk/app/display/gimpnavigationeditor.c	Sun Aug 24 08:05:07 2008
@@ -53,9 +53,6 @@
 #include "gimp-intl.h"
 
 
-#define BORDER_PEN_WIDTH  3
-
-
 static void        gimp_navigation_editor_docked_iface_init (GimpDockedInterface  *iface);
 
 static void        gimp_navigation_editor_destroy           (GtkObject            *object);
@@ -282,15 +279,15 @@
                                          &view_marker_width,
                                          &view_marker_height);
 
-  x = (x_org + click_x -
-       view_marker_x -
-       0.5 * (view_marker_width  - BORDER_PEN_WIDTH) -
-       2   * style->xthickness);
-
-  y = (y_org + click_y -
-       view_marker_y -
-       0.5 * (view_marker_height - BORDER_PEN_WIDTH) -
-       2   * style->ythickness);
+  x = (x_org + click_x       -
+       view_marker_x         -
+       view_marker_width / 2 -
+       style->xthickness * 4);
+
+  y = (y_org + click_y        -
+       view_marker_y          -
+       view_marker_height / 2 -
+       style->ythickness  * 4);
 
   /* If the popup doesn't fit into the screen, we have a problem.
    * We move the popup onscreen and risk that the pointer is not
@@ -316,8 +313,8 @@
 
   /* fill in then grab pointer */
   gimp_navigation_view_set_motion_offset (view,
-                                          0.5 * (view_marker_width  - BORDER_PEN_WIDTH),
-                                          0.5 * (view_marker_height - BORDER_PEN_WIDTH));
+                                          view_marker_width  / 2,
+                                          view_marker_height / 2);
   gimp_navigation_view_grab_pointer (view);
 }