Zoom with scroll wheel

Changed files (2)

• modified libbirdfont/FontDisplay.vala
• modified libbirdfont/Glyph.vala

Diff

diff --git a/libbirdfont/FontDisplay.vala b/libbirdfont/FontDisplay.valaindex 726913f..b8d5ed7 100644--- a/libbirdfont/FontDisplay.vala+++ b/libbirdfont/FontDisplay.vala@@ -74,7 +74,7 @@ public abstract class FontDisplay : GLib.Object { 	public virtual void double_click (uint button, double ex, double ey) { 	} -  public virtual void magnify (double magnification) {+	public virtual void magnify (double magnification) { 	}  	public virtual void tap_down (int finger, int x, int y) {diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 02cd13f..4caae7a 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -424,21 +424,10 @@ public class Glyph : FontDisplay { 	public override void scroll_wheel (double x, double y, 		double pixeldelta_x, double pixeldelta_y) { -		if (KeyBindings.has_alt () || KeyBindings.has_ctrl ()) {-			if (pixeldelta_y > 0) {-				zoom_in_at_point (x, y, pixeldelta_y);-			} else {-				zoom_out_at_point (x, y, pixeldelta_y);-			}+		if (pixeldelta_y > 0) {+			zoom_in_at_point (x, y, pixeldelta_y); 		} else {-			if (!KeyBindings.has_shift ()) {-				view_offset_x -= pixeldelta_x / view_zoom;-				view_offset_y -= pixeldelta_y / view_zoom;-			} else {-				// move canvas a long x axis instead of y-				view_offset_x -= pixeldelta_y / view_zoom;-				view_offset_y -= pixeldelta_x / view_zoom;-			}+			zoom_out_at_point (x, y, pixeldelta_y); 		}  		GlyphCanvas.redraw ();