diff options
Diffstat (limited to 'shell/ev-view.c')
| -rw-r--r-- | shell/ev-view.c | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/shell/ev-view.c b/shell/ev-view.c index 3e28b0c..552b771 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -667,38 +667,32 @@ ev_view_scroll_view (EvView *view, GtkScrollType scroll, gboolean horizontal) { - if (scroll == GTK_SCROLL_PAGE_BACKWARD) { - ev_page_cache_prev_page (view->page_cache); - } else if (scroll == GTK_SCROLL_PAGE_FORWARD) { - ev_page_cache_next_page (view->page_cache); - } else { - GtkAdjustment *adjustment; - double value; + GtkAdjustment *adjustment; + double value; - if (horizontal) { - adjustment = view->hadjustment; - } else { - adjustment = view->vadjustment; - } + if (horizontal) { + adjustment = view->hadjustment; + } else { + adjustment = view->vadjustment; + } - value = adjustment->value; + value = adjustment->value; - switch (scroll) { - case GTK_SCROLL_STEP_BACKWARD: - value -= adjustment->step_increment; - break; - case GTK_SCROLL_STEP_FORWARD: - value += adjustment->step_increment; - break; - default: - break; - } + switch (scroll) { + case GTK_SCROLL_STEP_BACKWARD: + value -= adjustment->step_increment; + break; + case GTK_SCROLL_STEP_FORWARD: + value += adjustment->step_increment; + break; + default: + break; + } - value = CLAMP (value, adjustment->lower, - adjustment->upper - adjustment->page_size); + value = CLAMP (value, adjustment->lower, + adjustment->upper - adjustment->page_size); - gtk_adjustment_set_value (adjustment, value); - } + gtk_adjustment_set_value (adjustment, value); } #define MARGIN 5 @@ -1824,9 +1818,6 @@ ev_view_class_init (EvViewClass *class) add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE); add_scroll_binding_keypad (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE); add_scroll_binding_keypad (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE); - - add_scroll_binding_keypad (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_BACKWARD, FALSE); - add_scroll_binding_keypad (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD, FALSE); } static void |