diff canvas.d @ 14:0b7e7d43a79d

Checkpoint
author "David Bryant <bagnose@gmail.com>"
date Sun, 12 Jul 2009 01:23:32 +0930
parents f0ade1b49fe7
children 2f79aab4d385
line wrap: on
line diff
--- 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;