Added scrolling using mouse or touchpad.

[familia.git] / src / ui / drawing_area.c

diff --git a/src/ui/drawing_area.c b/src/ui/drawing_area.c
index 06ba5e51399375b89bef3035827d1cba31047536..3457998930fa9fcf661cf9d3dadfe6b22f5ee03a 100644 (file)
--- a/src/ui/drawing_area.c
+++ b/src/ui/drawing_area.c
@@ -5,6 +5,7 @@
 #include <assert.h>
 
 #include "../debug.h"
+#include "../familia.h"
 #include "drawing_area.h"
 #include "../math/3d.h"
 #include "../graphics/constants.h"
@@ -152,21 +153,42 @@ void drawing_area_unrealize (GtkWidget *widget, gpointer data)
 
 /**
  * The "scroll-event" signal handler. Responsible for correctly scrolling
- * drawing area.
+ * drawing area using mouse or touchpad.
  */
 void drawing_area_event_scroll (GtkWidget *widget,
-                               GdkEventScroll *event, gpointer user_data)
+                               GdkEventScroll *event, FamiliaData *data)
 {
+       GtkAdjustment *adjustment = NULL;
+       gdouble value = 0;
+       gdouble step = 0;
+
        assert(event->type == GDK_SCROLL);
 
        switch(event->direction) {
                case GDK_SCROLL_UP:
-                       camera_pos_y++;
-                       gtk_widget_queue_draw(widget);
+                       adjustment = data->vadjustment;
+                       step = 1;
                        break;
                case GDK_SCROLL_DOWN:
-                       camera_pos_y--;
-                       gtk_widget_queue_draw(widget);
+                       adjustment = data->vadjustment;
+                       step = -1;
+                       break;
+               case GDK_SCROLL_LEFT:
+                       adjustment = data->hadjustment;
+                       step = -1;
+                       break;
+               case GDK_SCROLL_RIGHT:
+                       adjustment = data->hadjustment;
+                       step = 1;
                        break;
        }
+
+       if (adjustment != NULL) {
+               value = gtk_adjustment_get_value (adjustment);
+               step  = step * gtk_adjustment_get_step_increment(adjustment);
+               value += step;
+
+               gtk_adjustment_set_value (adjustment, value);
+               gtk_adjustment_value_changed (adjustment);
+       }
 }