From 9d17a53267d0e8ce72be960fa01579db5d248a96 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 18 Jul 2008 11:58:57 +0000 Subject: [PATCH] moved last motion stuff to the end svn path=/trunk/; revision=26233 --- app/display/gimpdisplayshell.c | 6 +++--- app/display/gimpdisplayshell.h | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index fcebe75689..097b715d16 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -338,15 +338,15 @@ gimp_display_shell_init (GimpDisplayShell *shell) shell->scroll_start_y = 0; shell->button_press_before_focus = FALSE; + shell->highlight = NULL; + shell->mask = NULL; + shell->last_motion_time = 0; shell->last_motion_delta_x = 0.0; shell->last_motion_delta_y = 0.0; shell->last_motion_distance = 0.0; shell->last_motion_delta_time = 0.0; - shell->highlight = NULL; - shell->mask = NULL; - gtk_window_set_role (GTK_WINDOW (shell), "gimp-image-window"); gtk_window_set_resizable (GTK_WINDOW (shell), TRUE); diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h index 52f85ba2d5..4d47be9300 100644 --- a/app/display/gimpdisplayshell.h +++ b/app/display/gimpdisplayshell.h @@ -181,13 +181,6 @@ struct _GimpDisplayShell gint scroll_start_y; gboolean button_press_before_focus; - guint32 last_motion_time; /* previous time of a forwarded motion event */ - guint32 last_read_motion_time; - gdouble last_motion_delta_time; - gdouble last_motion_delta_x; - gdouble last_motion_delta_y; - gdouble last_motion_distance; - GdkRectangle *highlight; /* in image coordinates, can be NULL */ GimpDrawable *mask; GimpChannelType mask_color; @@ -195,6 +188,14 @@ struct _GimpDisplayShell gpointer scroll_info; GimpCoords last_coords; /* last motion event */ + + guint32 last_motion_time; /* previous time of a forwarded motion event */ + guint32 last_read_motion_time; + gdouble last_motion_delta_time; + gdouble last_motion_delta_x; + gdouble last_motion_delta_y; + gdouble last_motion_distance; + }; struct _GimpDisplayShellClass