[gimp] app: fix gimp_display_shell_scroll() again to work right with rotation
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: fix gimp_display_shell_scroll() again to work right with rotation
- Date: Tue, 5 Jan 2016 19:32:26 +0000 (UTC)
commit 5521ce08831123d99a1b3f0ea5375881cfbb4282
Author: Michael Natterer <mitch gimp org>
Date: Tue Jan 5 20:29:54 2016 +0100
app: fix gimp_display_shell_scroll() again to work right with rotation
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.
app/display/gimpdisplayshell-scroll.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
index d7f2e87..919264b 100644
--- a/app/display/gimpdisplayshell-scroll.c
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -88,10 +88,11 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
if (x_offset || y_offset)
{
+ gimp_display_shell_scrolled (shell);
+
gimp_overlay_box_scroll (GIMP_OVERLAY_BOX (shell->canvas),
-x_offset, -y_offset);
- gimp_display_shell_scrolled (shell);
}
/* 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_expose_full (shell);
-
gimp_display_shell_scrolled (shell);
+ gimp_display_shell_expose_full (shell);
+
/* re-enable the active tool */
gimp_display_shell_resume (shell);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]