[gimp] Use the GimpDisplayConfig from GimpDisplay where possible



commit 7d878f6f4b148475a55d003b34a53bd604d235f5
Author: Michael Natterer <mitch gimp org>
Date:   Sun Oct 4 20:22:06 2009 +0200

    Use the GimpDisplayConfig from GimpDisplay where possible
    
    ...instead of going via display->gimp and casting.

 app/display/gimpnavigationeditor.c |    2 +-
 app/tools/gimpaligntool.c          |   12 ++++--------
 app/tools/gimpmovetool.c           |   13 +++----------
 3 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
index c8456a1..8185517 100644
--- a/app/display/gimpnavigationeditor.c
+++ b/app/display/gimpnavigationeditor.c
@@ -346,7 +346,7 @@ gimp_navigation_editor_new_private (GimpMenuFactory  *menu_factory,
   if (shell)
     {
       Gimp              *gimp   = shell->display->gimp;
-      GimpDisplayConfig *config = GIMP_DISPLAY_CONFIG (gimp->config);
+      GimpDisplayConfig *config = shell->display->config;
       GimpView          *view;
 
       editor = g_object_new (GIMP_TYPE_NAVIGATION_EDITOR, NULL);
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
index 64408bf..968ab00 100644
--- a/app/tools/gimpaligntool.c
+++ b/app/tools/gimpaligntool.c
@@ -351,9 +351,7 @@ gimp_align_tool_button_release (GimpTool              *tool,
       GimpVectors *vectors;
       GimpGuide   *guide;
       GimpLayer   *layer;
-      gint         snap_distance;
-
-      snap_distance = GIMP_DISPLAY_CONFIG (display->gimp->config)->snap_distance;
+      gint         snap_distance = display->config->snap_distance;
 
       if (gimp_draw_tool_on_vectors (GIMP_DRAW_TOOL (tool), display,
                                      coords, snap_distance, snap_distance,
@@ -477,11 +475,9 @@ gimp_align_tool_oper_update (GimpTool         *tool,
                              gboolean          proximity,
                              GimpDisplay      *display)
 {
-  GimpAlignTool      *align_tool  = GIMP_ALIGN_TOOL (tool);
-  GimpDisplayShell   *shell       = gimp_display_get_shell (display);
-  gint                snap_distance;
-
-  snap_distance = GIMP_DISPLAY_CONFIG (display->gimp->config)->snap_distance;
+  GimpAlignTool      *align_tool    = GIMP_ALIGN_TOOL (tool);
+  GimpDisplayShell   *shell         = gimp_display_get_shell (display);
+  gint                snap_distance = display->config->snap_distance;
 
   if (gimp_draw_tool_on_vectors (GIMP_DRAW_TOOL (tool), display,
                                  coords, snap_distance, snap_distance,
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
index c8b5181..4bc7463 100644
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@@ -247,10 +247,7 @@ gimp_move_tool_button_press (GimpTool            *tool,
         {
           GimpGuide *guide;
           GimpLayer *layer;
-          gint       snap_distance;
-
-          snap_distance =
-            GIMP_DISPLAY_CONFIG (display->gimp->config)->snap_distance;
+          gint       snap_distance = display->config->snap_distance;
 
           if (gimp_display_shell_get_show_guides (shell) &&
               (guide = gimp_image_find_guide (display->image,
@@ -663,9 +660,7 @@ gimp_move_tool_oper_update (GimpTool         *tool,
       gimp_display_shell_get_show_guides (shell)      &&
       proximity)
     {
-      gint snap_distance;
-
-      snap_distance = GIMP_DISPLAY_CONFIG (display->gimp->config)->snap_distance;
+      gint snap_distance = display->config->snap_distance;
 
       guide = gimp_image_find_guide (display->image, coords->x, coords->y,
                                      FUNSCALEX (shell, snap_distance),
@@ -734,9 +729,7 @@ gimp_move_tool_cursor_update (GimpTool         *tool,
     {
       GimpGuide *guide;
       GimpLayer *layer;
-      gint       snap_distance;
-
-      snap_distance = GIMP_DISPLAY_CONFIG (display->gimp->config)->snap_distance;
+      gint       snap_distance = display->config->snap_distance;
 
       if (gimp_display_shell_get_show_guides (shell) &&
           (guide = gimp_image_find_guide (display->image, coords->x, coords->y,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]