# HG changeset patch
# User "David Bryant <bagnose@gmail.com>"
# Date 1247327612 -34200
# Node ID 0b7e7d43a79ddd9d17242413019e220131ec982f
# Parent  f0ade1b49fe713f3175a2d374ff73ef7e3baa1ee
Checkpoint

diff -r f0ade1b49fe7 -r 0b7e7d43a79d canvas.d
--- a/canvas.d	Sun Jul 12 01:04:35 2009 +0930
+++ b/canvas.d	Sun Jul 12 01:23:32 2009 +0930
@@ -190,7 +190,6 @@
             update_adjustments;
             update_rulers;
 
-
             return true;
         }
 
@@ -339,7 +338,7 @@
             GtkAdjustment * v_gtkAdjustment = mVAdjustment.getAdjustmentStruct;
 
             Point view_left_bottom = Point(gtk_adjustment_get_value(h_gtkAdjustment),
-                                             gtk_adjustment_get_value(v_gtkAdjustment));
+                                           gtk_adjustment_get_value(v_gtkAdjustment));
             //writefln("%s", view_left_bottom);
             Vector model_size = screen_to_model(mViewSize);
             mViewCentre = view_left_bottom + model_size / 2.0;
@@ -361,13 +360,13 @@
             mHRuler.setRange(view_left_bottom.x,
                              view_right_top.x,
                              position,
-                             mZoom * 2000.0);
+                             mZoom * 10.0);
 
             mVRuler.getRange(lower, upper, position, max_size);
             mVRuler.setRange(view_right_top.y,
                              view_left_bottom.y,
-                             0.0,
-                             mZoom * 2000.0);
+                             position,
+                             mZoom * 10.0);
         }
 
         void update_adjustments() {
@@ -390,15 +389,15 @@
             gtk_adjustment_set_lower(h_gtkAdjustment, mCanvasLeftBottom.x);
             gtk_adjustment_set_upper(h_gtkAdjustment, mCanvasRightTop.x);
             gtk_adjustment_set_value(h_gtkAdjustment, view_left_bottom.x);
-            gtk_adjustment_set_step_increment(h_gtkAdjustment, canvas_size.x / 10.0);
-            gtk_adjustment_set_page_increment(h_gtkAdjustment, canvas_size.x / 5.0);
+            gtk_adjustment_set_step_increment(h_gtkAdjustment, canvas_size.x / 16.0);
+            gtk_adjustment_set_page_increment(h_gtkAdjustment, canvas_size.x / 4.0);
             gtk_adjustment_set_page_size(h_gtkAdjustment, model_size.x);
 
             gtk_adjustment_set_lower(v_gtkAdjustment, mCanvasLeftBottom.y);
             gtk_adjustment_set_upper(v_gtkAdjustment, mCanvasRightTop.y);
             gtk_adjustment_set_value(v_gtkAdjustment, view_left_bottom.y);
-            gtk_adjustment_set_step_increment(v_gtkAdjustment, canvas_size.y / 10.0);
-            gtk_adjustment_set_page_increment(v_gtkAdjustment, canvas_size.y / 5.0);
+            gtk_adjustment_set_step_increment(v_gtkAdjustment, canvas_size.y / 16.0);
+            gtk_adjustment_set_page_increment(v_gtkAdjustment, canvas_size.y / 4.0);
             gtk_adjustment_set_page_size(v_gtkAdjustment, model_size.y);
 
             mHAdjustment.changed;
diff -r f0ade1b49fe7 -r 0b7e7d43a79d gui.d
--- a/gui.d	Sun Jul 12 01:04:35 2009 +0930
+++ b/gui.d	Sun Jul 12 01:23:32 2009 +0930
@@ -19,7 +19,7 @@
 
 void main(string[] args) {
     Main.init(args);
-    auto window = new MainWindow("Title");
+    auto window = new MainWindow("Doodle");
     Tool[] tools;
     tools ~= new PanTool;
     tools ~= new ZoomTool;
@@ -29,7 +29,7 @@
     layers ~= tool_layer;
     auto canvas = new Canvas(layers, tool_layer, 120.0);
     window.add(canvas);
-    window.setDefaultSize(420, 340);
+    window.setDefaultSize(380, 480);
     window.showAll();
     Main.run();
 
diff -r f0ade1b49fe7 -r 0b7e7d43a79d standard_tools.d
--- a/standard_tools.d	Sun Jul 12 01:04:35 2009 +0930
+++ b/standard_tools.d	Sun Jul 12 01:23:32 2009 +0930
@@ -40,10 +40,10 @@
 
             switch (event.scroll_direction) {
             case ScrollDirection.UP:
-                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(-AMOUNT, 0.0) : Vector(0.0, -AMOUNT);
+                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(AMOUNT, 0.0) : Vector(0.0, AMOUNT);
                 break;
             case ScrollDirection.DOWN:
-                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(AMOUNT, 0.0) : Vector(0.0, AMOUNT);
+                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(-AMOUNT, 0.0) : Vector(0.0, -AMOUNT);
                 break;
             case ScrollDirection.LEFT:
                 delta = Vector(-AMOUNT, 0.0);
diff -r f0ade1b49fe7 -r 0b7e7d43a79d tool_layer.d
--- a/tool_layer.d	Sun Jul 12 01:04:35 2009 +0930
+++ b/tool_layer.d	Sun Jul 12 01:23:32 2009 +0930
@@ -17,7 +17,7 @@
     }
 
     override bool handle_button_press(Viewport viewport, in ButtonEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
 
         if (mGrabbedTool is null) {
             foreach_reverse(ref tool; mTools) {
@@ -36,7 +36,7 @@
     }
 
     override bool handle_button_release(Viewport viewport, in ButtonEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
 
         if (mGrabbedTool !is null) {
             mGrabbedTool.handle_button_release(viewport, event);
@@ -50,17 +50,19 @@
     }
 
     override bool handle_key_press(Viewport viewport, in KeyEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
+
         return true;
     }
 
     override bool handle_key_release(Viewport viewport, in KeyEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
+
         return true;
     }
 
     override bool handle_motion(Viewport viewport, in MotionEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
 
         if (mGrabbedTool is null) {
             foreach_reverse(ref tool; mTools) {
@@ -77,7 +79,7 @@
     }
 
     override bool handle_scroll(Viewport viewport, in ScrollEvent event) {
-        writefln("%s", event);
+        // writefln("%s", event);
 
         if (mGrabbedTool is null) {
             foreach_reverse(ref tool; mTools) {