callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
... and image_resolution != screen_resolution.

Partially revert commit 26ea7a3530.

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.
This commit is contained in:
Ell
2016-05-29 19:45:30 +00:00
parent 729c1edd45
commit 513446a85b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/display/gimpdisplayshell.c
View File

@ -781,6 +781,9 @@ gimp_display_shell_constructed (GObject *object)
gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar)); gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
} }
/* make sure the information is up-to-date */
gimp_display_shell_scale_update (shell);
} }
static void static void
@ -1521,23 +1524,28 @@ gimp_display_shell_fill (GimpDisplayShell *shell,
GimpUnit unit, GimpUnit unit,
gdouble scale) gdouble scale)
{ {
GimpDisplayConfig *config;
GimpImageWindow *window; GimpImageWindow *window;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_DISPLAY (shell->display)); g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
g_return_if_fail (GIMP_IS_IMAGE (image)); g_return_if_fail (GIMP_IS_IMAGE (image));
config = shell->display->config;
window = gimp_display_shell_get_window (shell); 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_unit (shell, unit);
gimp_display_shell_set_initial_scale (shell, scale, NULL, NULL); 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 /* center the image so subsequent stuff only moves it a little in
* the center * the center
*/ */
gimp_display_shell_scroll_center_image (shell, TRUE, TRUE); 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_image_window_suspend_keep_pos (window);
gimp_display_shell_appearance_update (shell); gimp_display_shell_appearance_update (shell);