summaryrefslogtreecommitdiff
path: root/src/nautilus-files-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nautilus-files-view.c')
-rw-r--r--src/nautilus-files-view.c27
1 files changed, 7 insertions, 20 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index a18cd8cf8..fe276e277 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -8914,14 +8914,17 @@ nautilus_files_view_set_property (GObject *object,
}
}
-
-gboolean
-nautilus_files_view_handle_scroll_event (NautilusFilesView *directory_view,
- GdkEventScroll *event)
+/* handle Ctrl+Scroll, which will cause a zoom-in/out */
+static gboolean
+nautilus_files_view_scroll_event (GtkWidget *widget,
+ GdkEventScroll *event)
{
+ NautilusFilesView *directory_view;
static gdouble total_delta_y = 0;
gdouble delta_x, delta_y;
+ directory_view = NAUTILUS_FILES_VIEW (widget);
+
if (event->state & GDK_CONTROL_MASK)
{
switch (event->direction)
@@ -8983,22 +8986,6 @@ nautilus_files_view_handle_scroll_event (NautilusFilesView *directory_view,
return FALSE;
}
-/* handle Shift+Scroll, which will cause a zoom-in/out */
-static gboolean
-nautilus_files_view_scroll_event (GtkWidget *widget,
- GdkEventScroll *event)
-{
- NautilusFilesView *directory_view;
-
- directory_view = NAUTILUS_FILES_VIEW (widget);
- if (nautilus_files_view_handle_scroll_event (directory_view, event))
- {
- return TRUE;
- }
-
- return FALSE;
-}
-
static void
action_reload_enabled_changed (GActionGroup *action_group,