Merge lp:~mefrio-g/pantheon-files/fix-1004483 into lp:~elementary-apps/pantheon-files/trunk

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 822
Proposed branch: lp:~mefrio-g/pantheon-files/fix-1004483
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 42 lines (+25/-0)
1 file modified
src/fm-directory-view.c (+25/-0)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-1004483
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107371@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c 2012-05-24 15:42:09 +0000
+++ src/fm-directory-view.c 2012-05-25 13:04:21 +0000
@@ -795,6 +795,9 @@
795fm_directory_view_handle_scroll_event (FMDirectoryView *directory_view,795fm_directory_view_handle_scroll_event (FMDirectoryView *directory_view,
796 GdkEventScroll *event)796 GdkEventScroll *event)
797{797{
798 gdouble total_delta_y = 0;
799 gdouble delta_x, delta_y;
800
798 if (event->state & GDK_CONTROL_MASK) {801 if (event->state & GDK_CONTROL_MASK) {
799 switch (event->direction) {802 switch (event->direction) {
800 case GDK_SCROLL_UP:803 case GDK_SCROLL_UP:
@@ -807,6 +810,28 @@
807 fm_directory_view_zoom_out (directory_view);810 fm_directory_view_zoom_out (directory_view);
808 return TRUE;811 return TRUE;
809812
813 case GDK_SCROLL_SMOOTH:
814 gdk_event_get_scroll_deltas ((const GdkEvent *) event,
815 &delta_x, &delta_y);
816
817 /* try to emulate a normal scrolling event by summing deltas */
818 total_delta_y += delta_y;
819
820 if (total_delta_y >= 1) {
821 total_delta_y = 0;
822 /* emulate scroll down */
823 fm_directory_view_zoom_out (directory_view);
824 return TRUE;
825 } else if (total_delta_y <= - 1) {
826 total_delta_y = 0;
827 /* emulate scroll up */
828 fm_directory_view_zoom_in (directory_view);
829 return TRUE;
830 } else {
831 /* eat event */
832 return TRUE;
833 }
834
810 case GDK_SCROLL_LEFT:835 case GDK_SCROLL_LEFT:
811 case GDK_SCROLL_RIGHT:836 case GDK_SCROLL_RIGHT:
812 break;837 break;

Subscribers

People subscribed via source and target branches

to all changes: