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

app: fix gimp_display_shell_scroll() again to work right with rotation

Browse Source 
Call gimp_display_shell_scrolled() before gimp_overlay_box_scroll()
so the rotate transform is updated before the actual scrolling.

The explicit call to gimp_display_shell_rotate_update_transform() got
lost during the last commits, but this solution is cleaner and less
redundant anyway.
This commit is contained in:
Michael Natterer
2016-01-05 20:29:54 +01:00
parent 117800063e
commit 5521ce0883
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/display/gimpdisplayshell-scroll.c
View File

@ -88,10 +88,11 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
if (x_offset || y_offset) if (x_offset || y_offset)
{ {
gimp_display_shell_scrolled (shell);
gimp_overlay_box_scroll (GIMP_OVERLAY_BOX (shell->canvas), gimp_overlay_box_scroll (GIMP_OVERLAY_BOX (shell->canvas),
-x_offset, -y_offset); -x_offset, -y_offset);
gimp_display_shell_scrolled (shell);
} }
/* re-enable the active tool */ /* re-enable the active tool */
@ -132,10 +133,10 @@ gimp_display_shell_scroll_set_offset (GimpDisplayShell *shell,
gimp_display_shell_scroll_clamp_and_update (shell); gimp_display_shell_scroll_clamp_and_update (shell);
gimp_display_shell_expose_full (shell);
gimp_display_shell_scrolled (shell); gimp_display_shell_scrolled (shell);
gimp_display_shell_expose_full (shell);
/* re-enable the active tool */ /* re-enable the active tool */
gimp_display_shell_resume (shell); gimp_display_shell_resume (shell);
} }