Further clarify and simplify.

2008-08-24  Martin Nordholts  <martinn@svn.gnome.org>

	* app/display/gimpnavigationeditor.c
	(gimp_navigation_editor_popup): Further clarify and simplify.

svn path=/trunk/; revision=26740

ChangeLog

+2008-08-24  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpnavigationeditor.c
+	(gimp_navigation_editor_popup): Further clarify and simplify.
+
 2008-08-24  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpnavigationeditor.c

app/display/gimpnavigationeditor.c

@@ -227,11 +227,8 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
   GimpNavigationView   *view;
   GdkScreen            *screen;
   gint                  x, y;
-  gint                  x_org, y_org;
-  gint                  view_marker_x;
-  gint                  view_marker_y;
-  gint                  view_marker_width;
-  gint                  view_marker_height;
+  gint                  view_marker_x, view_marker_y;
+  gint                  view_marker_width, view_marker_height;
 
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -264,30 +261,39 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
       editor = GIMP_NAVIGATION_EDITOR (gtk_bin_get_child (GTK_BIN (bin)));
     }
 
-  screen = gtk_widget_get_screen (widget);
-
-  gtk_window_set_screen (GTK_WINDOW (shell->nav_popup), screen);
-
   view = GIMP_NAVIGATION_VIEW (editor->view);
 
-  /* decide where to put the popup */
-  gdk_window_get_origin (widget->window, &x_org, &y_org);
+  /* Set poup screen */
+  screen = gtk_widget_get_screen (widget);
+  gtk_window_set_screen (GTK_WINDOW (shell->nav_popup), screen);
 
   gimp_navigation_view_get_local_marker (view,
                                          &view_marker_x,
                                          &view_marker_y,
                                          &view_marker_width,
                                          &view_marker_height);
+  /* Position the popup */
+  {
+    gint x_origin, y_origin;
+    gint border_width, border_height;
+    gint screen_click_x, screen_click_y;
+    
+    gdk_window_get_origin (widget->window, &x_origin, &y_origin);
+
+    screen_click_x = x_origin + click_x;
+    screen_click_y = y_origin + click_y;
+    border_width   = style->xthickness * 4;
+    border_height  = style->ythickness * 4;
 
-  x = (x_org + click_x       -
+    x = screen_click_x -
+        border_width -
         view_marker_x -
-       view_marker_width / 2 -
-       style->xthickness * 4);
+        view_marker_width / 2;
 
-  y = (y_org + click_y        -
+    y = screen_click_y -
+        border_height -
         view_marker_y -
-       view_marker_height / 2 -
-       style->ythickness  * 4);
+        view_marker_height / 2;
 
     /* 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
@@ -299,16 +305,17 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
      * Warping the pointer would be another solution ...
      */
 
-  x = CLAMP (x, 0, (gdk_screen_get_width (screen)  -
+    x = CLAMP (x, 0, gdk_screen_get_width (screen)  -
                GIMP_VIEW (view)->renderer->width  -
-                    4 * style->xthickness));
-  y = CLAMP (y, 0, (gdk_screen_get_height (screen) -
+               border_width);
+    y = CLAMP (y, 0, gdk_screen_get_height (screen) -
                GIMP_VIEW (view)->renderer->height -
-                    4 * style->ythickness));
+               border_height);
 
     gtk_window_move (GTK_WINDOW (shell->nav_popup), x, y);
-  gtk_widget_show (shell->nav_popup);
+  }
 
+  gtk_widget_show (shell->nav_popup);
   gdk_flush ();
 
   /* fill in then grab pointer */