Changeset 546

Timestamp:

03/07/08 16:35:16 (10 months ago)

Author:

kickback

Message:

sweep: make hand tool mimic inertia and not a rubber band. (if you stop moving the mouse before you let go, there is no inertia now)

Files:

• sweep/trunk/src/sample-display.c (modified) (3 diffs)
• sweep/trunk/src/sample-display.h (modified) (1 diff)
• sweep/trunk/src/sweep-scheme.c (modified) (2 diffs)

sweep/trunk/src/sample-display.c

@@ -1745 +1745 @@
-  gint new_win_start, win_length;
-  gfloat step;
+  gdouble elapsed;
+    
+  if (s->release_timer != NULL) {
+    elapsed = g_timer_elapsed (s->release_timer, NULL);
+    g_timer_destroy (s->release_timer);
+    s->release_timer = NULL;
+
+    if (elapsed > 0.13) {
+      s->hand_scroll_delta = 0;
+      return FALSE;
+    }
+  }
-  
-  win_length = s->view->end - s->view->start;
@@ -2045 +2057 @@
-          s->hand_scroll_delta = delta;
-  
+  if (s->release_timer == NULL)
+    s->release_timer = g_timer_new ();
+  else
+    g_timer_start (s->release_timer);
+    
-  if (s->view->hand_offset != x){
-    move = s->view->hand_offset - x;
@@ -3109 +3126 @@
-  s->scroll_right_tag = 0;
-  s->scheme = NULL;
+  s->release_timer = NULL;
-}
-

sweep/trunk/src/sample-display.h

@@ -89 +89 @@
-  gint hand_scroll_tag;   /* gtk_timeout tag for natural hand scrolling */
-  gint hand_scroll_delta; /* natural hand scrolling */
+  GTimer * release_timer;
-
-  /* Window panning */

sweep/trunk/src/sweep-scheme.c

@@ -32 +32 @@
-  LAST_SIGNAL
-};
-
-
-
-enum {
@@ -69 +67 @@
-  "wave-shadow",
-}; 
-
-
-
-G_DEFINE_TYPE (SweepScheme, sweep_scheme, G_TYPE_OBJECT)