Changeset 301 for trunk/src/gtk/PageView.cxx

Timestamp:

01/15/08 10:55:30 (11 months ago)

Author:

jordi

Message:

Based on a patch by Stephan Ritscher <stephan.ritscher@…>, I've updated the key bindings to move to next/previous page when moving to the right/left respectively and the page is at its right/left-most position.

Files:

• trunk/src/gtk/PageView.cxx (modified) (7 diffs)

trunk/src/gtk/PageView.cxx

@@ -560 +560 @@
     PagePter *pter = (PagePter *)data;
 
-    GtkAdjustment *adjustment = 
+    GtkAdjustment *hadjustment = 
+        gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (widget));
+    gdouble hposition = gtk_adjustment_get_value (hadjustment);
+    GtkAdjustment *vadjustment = 
         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
-    gdouble position = gtk_adjustment_get_value (adjustment);
+    gdouble vposition = gtk_adjustment_get_value (vadjustment);
 
     if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) )
@@ -574 +577 @@
         case GDK_KP_Left:
         case GDK_h:
+            if ( hposition == hadjustment->lower )
+            {
+                pter->scrollToPreviousPage ();
+                return TRUE;
+            }
             direction = GTK_SCROLL_STEP_LEFT;
             horizontal = TRUE;
@@ -581 +589 @@
         case GDK_KP_Right:
         case GDK_l:
+            if ( hposition == ( hadjustment->upper - hadjustment->page_size) )
+            {
+                pter->scrollToNextPage ();
+                return TRUE;
+            }
             horizontal = TRUE;
             direction = GTK_SCROLL_STEP_RIGHT;
@@ -588 +601 @@
         case GDK_KP_Up:
         case GDK_k:
-            if ( position == adjustment->lower )
+            if ( vposition == vadjustment->lower )
             {
                 pter->scrollToPreviousPage ();
@@ -599 +612 @@
         case GDK_KP_Down:
         case GDK_j:
-            if ( position == ( adjustment->upper - adjustment->page_size) )
+            if ( vposition == ( vadjustment->upper - vadjustment->page_size) )
             {
                 pter->scrollToNextPage ();
@@ -609 +622 @@
         case GDK_Page_Up:
         case GDK_KP_Page_Up:
-            if ( position == adjustment->lower )
+            if ( vposition == vadjustment->lower )
             {
                 pter->scrollToPreviousPage ();
@@ -621 +634 @@
         case GDK_Page_Down:
         case GDK_KP_Page_Down:
-            if ( position == ( adjustment->upper - adjustment->page_size) )
+            if ( vposition == ( vadjustment->upper - vadjustment->page_size) )
             {
                 pter->scrollToNextPage ();