[gimp] app: fix initial display state when dot-for-dot is off by default

[N/A <ell src gnome org>]

commit 513446a85b9a941c64de1fbc87045afb000b78e7
Author: Ell <ell_se yahoo com>
Date:   Sun May 29 19:45:30 2016 +0000

    app: fix initial display state when dot-for-dot is off by default
    
    ... and image_resolution != screen_resolution.
    
    Partially revert commit 26ea7a3530fc62c2ba285675b9707ff7a147953a.
    
    Also, reset shell->dot_for_dot in gimp_display_shell_fill(), so that new
    images that use the first display don't inherit the dot-for-dot state of the
    previous image that used the same display.

 app/display/gimpdisplayshell.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 0c79ea0..fba145b 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -781,6 +781,9 @@ gimp_display_shell_constructed (GObject *object)
 
       gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
     }
+
+  /* make sure the information is up-to-date */
+  gimp_display_shell_scale_update (shell);
 }
 
 static void
@@ -1521,23 +1524,28 @@ gimp_display_shell_fill (GimpDisplayShell *shell,
                          GimpUnit          unit,
                          gdouble           scale)
 {
-  GimpImageWindow *window;
+  GimpDisplayConfig *config;
+  GimpImageWindow   *window;
 
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
   g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
   g_return_if_fail (GIMP_IS_IMAGE (image));
 
+  config = shell->display->config;
   window = gimp_display_shell_get_window (shell);
 
+  shell->dot_for_dot = config->default_dot_for_dot;
+
   gimp_display_shell_set_unit (shell, unit);
   gimp_display_shell_set_initial_scale (shell, scale, NULL, NULL);
+  gimp_display_shell_scale_update (shell);
 
   /* center the image so subsequent stuff only moves it a little in
    * the center
    */
   gimp_display_shell_scroll_center_image (shell, TRUE, TRUE);
 
-  gimp_display_shell_sync_config (shell, shell->display->config);
+  gimp_display_shell_sync_config (shell, config);
 
   gimp_image_window_suspend_keep_pos (window);
   gimp_display_shell_appearance_update (shell);