projects/doodle: doodle/gtk/canvas.d comparison

comparison doodle/gtk/canvas.d @ 41:f2e4e1d29b98

Bah

author	daveb
date	Tue, 01 Jun 2010 17:21:01 +0930
parents	1f97022e5c6d
children	1b4c9ba58673

comparison

equal deleted inserted replaced

-:1f97022e5c6d
+:f2e4e1d29b98
 import gtkc.gtk;
 }
 // x and y run right and up respectively
+//
+// Model units are millimetres.
+//
+// mZoom         -> pixels-per-model-unit
+// mViewSize     -> size of view window in pixels
+// mViewCentre   -> location in model corresponding to centre of view
+// mCanvasBounds -> size of the virtual canvas in model coordinates
+//
+// User operations:
+//   pan (middle click and drag)
+//   zoom about a point (hold control and move scroll wheel)
+//   resize the widget
 class Canvas : Table, Viewport {
 this(in Layer[] layers, EventHandler event_handler, Grid grid, in double ppi) {
 super(3, 3, 0);
 mDamage = mDamage | area;
 }
 private {
+void update_bounds() {
+}
 bool on_configure(GdkEventConfigure * event, Widget widget) {
 assert(widget is mDrawingArea);
+mViewSize = Vector(cast(double)event.width, cast(double)event.height);
+Rectangle layer_bounds = Rectangle.DEFAULT;
+foreach (ref layer; mLayers) {
+layer_bounds = layer_bounds | layer.bounds;
+}
+assert(layer_bounds.valid);
+Rectangle padded_layer_bounds = expand(move(layer_bounds, - layer_bounds.size), 2.0 * layer_bounds.size);
 if (!mHadConfigure) {
+info("1");
 const double MM_PER_INCH = 25.4;
 mZoom = 0.25 * mPPI / MM_PER_INCH;
-// Take the union of the bounds of each layer to
+mCanvasBounds = padded_layer_bounds;
-// determine the canvas size
-Rectangle layer_bounds = Rectangle.DEFAULT;
-foreach (ref layer; mLayers) {
-layer_bounds = layer_bounds | layer.bounds;
-}
-assert(layer_bounds.valid);
-mCanvasBounds = expand(move(layer_bounds, -layer_bounds.size), 2.0 * layer_bounds.size);
 mViewCentre = mCanvasBounds.centre;
 mGrid.zoom_changed(mZoom);
 mHadConfigure = true;
 }
+else {
-mViewSize = Vector(cast(double)event.width, cast(double)event.height);
+// Use configure events as an opportunity
+// to consolidate the canvas-bounds
+// XXX nasty code.
+Vector z = mViewSize / mZoom;
+Rectangle r = Rectangle(mViewCentre - z / 2.0, z);
+mCanvasBounds = r | padded_layer_bounds;
+}
 update_adjustments;
 update_rulers;
 //writefln("Canvas bounds: %s", mCanvasBounds);
 //writefln("View centre: %s", mViewCentre);
 // Fill the background
 pixel_cr.save; {
 // Make the window light grey
-pixel_cr.setSourceRgba(0.6, 0.6, 0.6, 1.0);
+pixel_cr.setSourceRgba(0.9, 0.9, 0.9, 1.0);
 rectangle(pixel_cr, pixel_damage);
 pixel_cr.fill;
 } pixel_cr.restore;
 // Draw each layer
 model_point,
 gtk2tk_mask(event.state));
 mEventHandler.handle_button_press(this, button_event);
-process_damage;
+fix_damage;
 return true;
 }
 bool on_button_release(GdkEventButton * event, Widget widget) {
 model_point,
 gtk2tk_mask(event.state));
 mEventHandler.handle_button_release(this, button_event);
-process_damage;
+fix_damage;
 return true;
 }
 bool on_key_event(GdkEventKey * event, Widget widget) {
 //writefln("Got key event\n");
 //auto key_event = new KeyEvent("",
 // mEventHandle.handle_key(key_event);
-process_damage;
+fix_damage;
 return true;
 }
 bool on_motion_notify(GdkEventMotion * event, Widget widget) {
 model_point,
 gtk2tk_mask(event.state));
 mEventHandler.handle_motion(this, motion_event);
-process_damage;
+fix_damage;
 return true;
 }
 bool on_scroll(GdkEventScroll * event, Widget widget) {
 model_point,
 gtk2tk_mask(event.state));
 mEventHandler.handle_scroll(this, scroll_event);
-process_damage;
+fix_damage;
 return true;
 }
 /*
 mHAdjustment.valueChanged;
 mVAdjustment.changed;
 mVAdjustment.valueChanged;
 }
-void process_damage() {
+void fix_damage() {
 if (mDamage.valid) {
 //writefln("Damage: %s", mDamage);
 int x, y, w, h;
 mDamage.get_quantised(x, y, w, h);
 mDrawingArea.queueDrawArea(x, cast(int)mViewSize.y - (y + h), w, h);
 bool mHadConfigure;
 Rectangle mDamage;          // pixels
 // Model units are in millimetres
 // Screen units are in pixels
-double mZoom;               // pixels-per-model-unit (mm)
+double mZoom;               // pixels-per-model-unit
 Vector mViewSize;           // pixel: size of view window in pixels
 Point mViewCentre;          // model: where in the model is the centre of our view
 Rectangle mCanvasBounds;    // model:
 // Child widgets:

Mercurial > projects > doodle

comparison doodle/gtk/canvas.d @ 41:f2e4e1d29b98