Changeset 468

Timestamp:

01/12/07 01:22:18 (2 years ago)

Author:

radekk

Message:

Smooth hand scroll - feature should be applied into production trunk.

Files:

• sweep/branches/sweep-info-panel/src/sample-display.c (modified) (6 diffs)
• sweep/branches/sweep-info-panel/src/sample-display.h (modified) (1 diff)

sweep/branches/sweep-info-panel/src/sample-display.c

@@ -115 +115 @@
-#define MARCH_INTERVAL 300
-#define PULSE_INTERVAL 450
+#define HAND_SCROLL_INTERVAL 50
-
-extern sw_view * last_tmp_view;
@@ -1812 +1813 @@
-
-static gint
+sample_display_hand_scroll (SampleDisplay * s)
+{
+  gint new_win_start, win_length;
+  gfloat step;
+  
+  win_length = s->view->end - s->view->start;
+
+  step = win_length * 1.0 / s->width;
+
+  new_win_start = s->view->start + s->hand_scroll_delta * step;
+  
+  new_win_start = CLAMP(new_win_start, 0,
+                        s->view->sample->sounddata->nr_frames -
+                        (s->view->end - s->view->start));
+
+  if(new_win_start != s->view->start) {
+    sample_display_set_window (s,
+                               new_win_start,
+                               new_win_start + win_length);
+  } else {
+          s->hand_scroll_delta = 0;
+  }
+/*
+  g_print ("s->delta: %i new_win_start: %i\n", s->hand_scroll_delta, new_win_start);
+*/
+  s->hand_scroll_delta *= 0.98;
+
+  return (s->hand_scroll_delta != 0);
+}
+
+static gint
-sample_display_scroll_left (gpointer data)
-{
@@ -2076 +2108 @@
-  gdouble step = (gdouble)(s->view->end - s->view->start) / ((gdouble)s->width);
-  GtkAdjustment * adj = GTK_ADJUSTMENT(s->view->adj);
-
+
+
+
+
+
+
+
+
+
+
+
-  if (s->view->hand_offset != x){
-    move = s->view->hand_offset - x;
@@ -2454 +2496 @@
-
-    case TOOL_HAND:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        break;
-
-    case TOOL_MARKER:
-       
-       
+
+
-        break;
-
@@ -2607 +2655 @@
-    break;
-  case TOOL_HAND:
+//    g_print("HT:Release:\n");
-    s->view->hand_offset = -1;
+
+    s->hand_scroll_tag = g_timeout_add (HAND_SCROLL_INTERVAL,
+                    (GSourceFunc)sample_display_hand_scroll,
+                    s);
+
-    break;
-
@@ -3214 +3268 @@
-  s->pulsing_tag = 0;
-  s->pulse = FALSE;
+  s->hand_scroll_tag = 0;
-  s->mouse_x = 0;
-  s->mouse_offset = 0;

sweep/branches/sweep-info-panel/src/sample-display.h

@@ -97 +97 @@
-  gboolean pulse;
-
+  gint hand_scroll_tag;   /* gtk_timeout tag for natural hand scrolling */
+  gint hand_scroll_delta; /* natural hand scrolling */
+
-  /* Window panning */
-  int selecting_x0;  /* the coordinate where the mouse was clicked */