Changeset 540

Timestamp:

08/23/08 18:46:11 (3 months ago)

Author:

bjourne

Message:

Revert all the smooth scrolling work back to r506. It is not possible
to make smooth scrolling work satisfactory without changes in
GTK+. Hopefully someday
http://bugzilla.gnome.org/show_bug.cgi?id=103811 will be fixed which
would give all widgets smooth scrolling.

Files:

• gtkimageview/src/gtkimageview.c (modified) (11 diffs)

gtkimageview/src/gtkimageview.c

@@ -254 +254 @@
- * </refsect1>
- **/
+
-#include <gdk/gdkkeysyms.h>
-#include <math.h>
-#include <stdlib.h>
-
@@ -670 +670 @@
-}
-
-typedef struct
-{
-    GtkImageView *view;
-    int           xsteps[4];
-    int           ysteps[4];
-    int           step_idx;
-    gboolean      set_adjustments;
-    gboolean      invalidate;
-} ScrollData;
-
-static gboolean
-gtk_image_view_scroller (gpointer data)
-{
-    ScrollData *scroll = (ScrollData *) data;
-    GtkImageView *view = scroll->view;
-
-    scroll->step_idx--;
-    gdouble scroll_x = scroll->xsteps[scroll->step_idx];
-    gdouble scroll_y = scroll->ysteps[scroll->step_idx];
-
-    gdouble new_x = view->offset_x + scroll_x;
-    gdouble new_y = view->offset_y + scroll_y;
-
-    gtk_image_view_clamp_offset (view, &new_x, &new_y);
-
-    scroll_x = new_x - view->offset_x;
-    scroll_y = new_y - view->offset_y;
-
-    view->offset_x += scroll_x;
-    view->offset_y += scroll_y;
-    if (scroll->invalidate)
-        gdk_window_invalidate_rect (GTK_WIDGET (view)->window, NULL, TRUE);
-    else
-        gtk_image_view_fast_scroll (view, scroll_x, scroll_y);
-    gtk_image_view_update_cursor (view);
-
-    if (scroll->set_adjustments)
-    {
-        g_signal_handlers_block_by_data (G_OBJECT (view->hadj), view);
-        g_signal_handlers_block_by_data (G_OBJECT (view->vadj), view);
-        gtk_adjustment_set_value (view->hadj, view->offset_x);
-        gtk_adjustment_set_value (view->vadj, view->offset_y);
-        g_signal_handlers_unblock_by_data (G_OBJECT (view->hadj), view);
-        g_signal_handlers_unblock_by_data (G_OBJECT (view->vadj), view);
-    }
-
-    return scroll->step_idx;
-}
-
-/**
- * gtk_image_view_slope:
- *
- * The explanation for this algorithm is here:
- * http://mail.python.org/pipermail/python-list/2008-March/482359.html
- * Thank you, Arnaud Delobelle!
- **/
-static void
-gtk_image_view_slope (int  dist,
-                      int  parts,
-                      int *steps)
-{
-    for (int n = 0; n < parts; n++)
-        steps[n] = (n + 1) * dist / parts - n * dist / parts;
-}
-
-/**
- * gtk_image_view_scroll_to:
@@ -744 +679 @@
- * @invalidate: whether to invalidate the view or redraw immedately,
- *  see gtk_image_view_set_offset()
- * @smooth: whether to scroll smooth or not
- *
- * Set the offset of where in the image the #GtkImageView should begin
@@ -750 +684 @@
- **/
-static void
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    int delta_x = offset_x - view->offset_x;
-    int delta_y = offset_y - view->offset_y;
-
-/
-// pixel.
+*
+   pixel. */
-    if (!delta_x && !delta_y)
-        return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void
@@ -818 +752 @@
-    else if (yscroll == GTK_SCROLL_PAGE_DOWN)
-        ystep = view->vadj->page_increment;
-
-
-
-
+
+
+
+
+
-}
-
@@ -943 +878 @@
-{
-    gdouble offset_x = GTK_ADJUSTMENT (adj)->value;
-
-
-
+
+
-}
-
@@ -953 +887 @@
-{
-    int offset_y = GTK_ADJUSTMENT (adj)->value;
-
-
-
+
+
-}
-
@@ -1024 +957 @@
-    GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
-
+    view->interp = GDK_INTERP_BILINEAR;
-    view->black_bg = FALSE;
-    view->is_rendering = FALSE;
-    view->interp = GDK_INTERP_BILINEAR;
-    view->fitting = TRUE;
-    view->pixbuf = NULL;
@@ -1032 +964 @@
-    view->offset_x = 0.0;
-    view->offset_y = 0.0;
+    view->is_rendering = FALSE;
-    view->show_frame = TRUE;
-    view->show_cursor = TRUE;
-    view->void_cursor = NULL;
-    view->tool = gtk_image_tool_dragger_new (view);
-
-
+
-    view->check_color1 = 0x666666;
-    view->check_color2 = 0x999999;
+    view->transp = GTK_IMAGE_TRANSP_GRID;
-
-    view->hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 0.0,
@@ -1609 +1542 @@
-                           gboolean      invalidate)
-{
-
-
+
-}
-
@@ -1763 +1695 @@
-          we must also update the adjustments.
-         */
-2
- FALSE, 
+
+
-        gtk_image_view_update_adjustments (view);
-        gtk_widget_queue_draw (GTK_WIDGET (view));