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

Proposed by Mohamed IKBEL Boulabiar
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) Approve
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.
Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'shell/ev-window.c'
--- shell/ev-window.c 2010-11-30 15:09:59 +0000
+++ shell/ev-window.c 2010-12-07 15:22:02 +0000
@@ -5470,16 +5470,16 @@
54705470
5471 if (drag->velocity_y >= 1.0 &&5471 if (drag->velocity_y >= 1.0 &&
5472 drag->position_y > priv->drag_start_y) {5472 drag->position_y > priv->drag_start_y) {
5473 ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));5473 ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
5474 } else if (drag->velocity_y <= -1.0 &&5474 } else if (drag->velocity_y <= -1.0 &&
5475 drag->position_y < priv->drag_start_y) {5475 drag->position_y < priv->drag_start_y) {
5476 ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));5476 ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
5477 } else if (drag->velocity_x >= 1.0 &&5477 } else if (drag->velocity_x >= 1.0 &&
5478 drag->position_x > priv->drag_start_x) {5478 drag->position_x > priv->drag_start_x) {
5479 ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));5479 ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
5480 } else if (drag->velocity_x <= -1.0 &&5480 } else if (drag->velocity_x <= -1.0 &&
5481 drag->position_x < priv->drag_start_x) {5481 drag->position_x < priv->drag_start_x) {
5482 ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));5482 ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
5483 }5483 }
54845484
5485 break;5485 break;
@@ -5525,7 +5525,7 @@
55255525
5526 if (drag->fingers == 1) {5526 if (drag->fingers == 1) {
5527 ev_view_drag (EV_VIEW (priv->view),5527 ev_view_drag (EV_VIEW (priv->view),
5528 (gdouble)drag->delta_x,5528 (gdouble)-drag->delta_x,
5529 (gdouble)-drag->delta_y);5529 (gdouble)-drag->delta_y);
5530 }5530 }
5531 }5531 }

Subscribers

People subscribed via source and target branches