Changeset 440

Timestamp:

11/25/06 01:14:36 (2 years ago)

Author:

radekk

Message:

Fixing some rounding problems in Hand Tool.

Files:

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

sweep/trunk/src/sample-display.c

@@ -1884 +1884 @@
-sample_display_handle_hand_motion (SampleDisplay * s, int x, int y)
-{
-sw_framecount_t
-sw_framecount_t step = PIXEL_TO_OFFSET(1
+gdouble
+gdouble step = (gdouble)(s->view->end - s->view->start) / ((gdouble)s->width
-  GtkAdjustment * adj = GTK_ADJUSTMENT(s->view->adj);
-
-//  g_print("X: %i OLD: %i MOVE: %i STEP: %i\n", x, s->view->hand_offset, s->view->hand_offset - x, step);
-
-  if (s->view->hand_offset != x){
-    move = s->view->hand_offset - x;
-
-
-
+
+
+
+
-
-    if (vstart < 0){
@@ -1904 +1903 @@
-        vend = s->view->sample->sounddata->nr_frames;
-    }
+/*
+    g_print("X: %i OLD: %i MOVE: %f STEP: %f start: %i end: %i vstart: %f vend: %f fstart:%f fend: %f\n",
+                   x, s->view->hand_offset, move, step,
+                   s->view->start, s->view->end, vstart, vend, round(vstart), round(vend));
+*/
+    vstart = round(vstart);
+    vend = round(vend);
+
+    if (s->view->start != vstart && s->view->end != vend)
+            s->view->hand_offset = x;
-
-    s->view->start = vstart;
@@ -1912 +1921 @@
-    gtk_adjustment_set_value( GTK_ADJUSTMENT(s->view->adj), vstart);
-  }
-
-
-
-
+
-
-static void

sweep/trunk/src/view.c

@@ -66 +66 @@
-#define USER_GTKRC
-
-#define SCROLL_SMOOTHLY
+ #define SCROLL_SMOOTHLY 
-
-/* Default initial dimensions.