Merge lp:~boulabiar/oif/evince-drag-fixes into lp:~oif-team/oif/evince-gestures-trunk

Proposed by Mohamed IKBEL Boulabiar on 2010-12-07
Status: Merged
Merged at revision: 4211
Proposed branch: lp:~boulabiar/oif/evince-drag-fixes
Merge into: lp:~oif-team/oif/evince-gestures-trunk
Diff against target: 33 lines (+5/-5)
1 file modified
shell/ev-window.c (+5/-5)
To merge this branch: bzr merge lp:~boulabiar/oif/evince-drag-fixes
Reviewer Review Type Date Requested Status
Cody Russell (community) 2010-12-07 Approve on 2010-12-07
Review via email: mp+42957@code.launchpad.net

Description of the change

This branch apply the gestures to the page, not to the camera.
A flick 'from top to bottom' moves the page 'from top to bottom' but go upwards,
etc...

To post a comment you must log in.
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/ev-window.c'
2--- shell/ev-window.c 2010-11-30 15:09:59 +0000
3+++ shell/ev-window.c 2010-12-07 15:22:02 +0000
4@@ -5470,16 +5470,16 @@
5
6 if (drag->velocity_y >= 1.0 &&
7 drag->position_y > priv->drag_start_y) {
8- ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
9+ ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
10 } else if (drag->velocity_y <= -1.0 &&
11 drag->position_y < priv->drag_start_y) {
12- ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
13+ ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
14 } else if (drag->velocity_x >= 1.0 &&
15 drag->position_x > priv->drag_start_x) {
16- ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
17+ ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
18 } else if (drag->velocity_x <= -1.0 &&
19 drag->position_x < priv->drag_start_x) {
20- ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
21+ ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
22 }
23
24 break;
25@@ -5525,7 +5525,7 @@
26
27 if (drag->fingers == 1) {
28 ev_view_drag (EV_VIEW (priv->view),
29- (gdouble)drag->delta_x,
30+ (gdouble)-drag->delta_x,
31 (gdouble)-drag->delta_y);
32 }
33 }

Subscribers

People subscribed via source and target branches