Fixed image rotation and add on axis to the button description

Changed files (5)

• modified libbirdfont/BackgroundImage.vala
• modified libbirdfont/BackgroundTool.vala
• modified libbirdfont/HiddenTools.vala
• modified libbirdfont/MoveTool.vala
• modified libbirdfont/PointTool.vala

Diff

diff --git a/libbirdfont/BackgroundImage.vala b/libbirdfont/BackgroundImage.valaindex dc62e76..6924ced 100644--- a/libbirdfont/BackgroundImage.vala+++ b/libbirdfont/BackgroundImage.vala@@ -17,7 +17,7 @@ using Math;  namespace BirdFont { 	-public class BackgroundImage {+public class BackgroundImage : GLib.Object { 	 	public string name = ""; 	public Gee.ArrayList<BackgroundSelection> selections;@@ -733,9 +733,13 @@ public class BackgroundImage { 		 		cr.scale (g.view_zoom, g.view_zoom); 		-		if (selected_handle == 2) Theme.color (cr, "Highlighted 1");-		else if (active_handle == 2) Theme.color (cr, "Default Background");-		else Theme.color (cr, "Menu Background");+		if (selected_handle == 2) {+			Theme.color (cr, "Highlighted 1");+		} else if (active_handle == 2) {+			Theme.color (cr, "Default Background");+		} else {+			Theme.color (cr, "Menu Background");+		}  		x = img_offset_x - g.view_offset_x + (size_margin / 2) * img_scale_x; 		y = img_offset_y - g.view_offset_y + (size_margin / 2) * img_scale_y;diff --git a/libbirdfont/BackgroundTool.vala b/libbirdfont/BackgroundTool.valaindex aae4960..151bd86 100644--- a/libbirdfont/BackgroundTool.vala+++ b/libbirdfont/BackgroundTool.vala@@ -13,6 +13,7 @@ */  using Cairo;+using Math;  namespace BirdFont { @@ -40,8 +41,12 @@ public class BackgroundTool : Tool { 	static BackgroundImage imported_background; 	static ImageSurface imported_surface; 	+	static bool on_axis = false;+	double rotation_position_x = 0;+	double rotation_position_y = 0;+				 	public BackgroundTool (string name) {-		base (name, t_("Move, resize and rotate background image"));+		base (name, ""); 		 		top_limit = 0; 		bottom_limit = 0;@@ -103,7 +108,7 @@ public class BackgroundTool : Tool { 			coordinate_y = Glyph.path_coordinate_y (y); 		 			if (background.selected_handle == 2) {-				background.set_img_rotation_from_coordinate (coordinate_x, coordinate_y);+				background.set_img_rotation_from_coordinate (rotation_position_x, rotation_position_y); 			} 						 			img_offset_x = background.img_offset_x;@@ -111,6 +116,7 @@ public class BackgroundTool : Tool { 			 			background.handler_release (x, y); 			+			on_axis = false; 			move_bg = false; 		}); @@ -135,7 +141,7 @@ public class BackgroundTool : Tool { 					break; 				case Key.RIGHT: 					move (1, 0);-					break;						+					break; 				default: 					break; 			}@@ -152,7 +158,19 @@ public class BackgroundTool : Tool { 			((!) background_image).draw_handle (cairo_context, glyph); 		}); 	}-		++	public override string get_tip () {+		string tip = t_("Move, resize and rotate background image") + "\n";+		tip += HiddenTools.move_along_axis.get_key_binding ();+		tip += " - ";+		tip += t_ ("on axis") + "\n";+		return tip;+	}+	+	public static void move_handle_on_axis () {+		on_axis = true;+	}+	 	void move (int x, int y) { 		Glyph g = MainWindow.get_current_glyph (); 		BackgroundImage? background_image = g.get_background_image ();@@ -176,13 +194,43 @@ public class BackgroundTool : Tool { 		dx *= PenTool.precision; 		dy *= PenTool.precision; +		// rotation handle 		if (bg.selected_handle == 2) { 			coordinate_x = Glyph.path_coordinate_x (x); 			coordinate_y = Glyph.path_coordinate_y (y); 			view_zoom = MainWindow.get_current_glyph ().view_zoom;-			bg.preview_img_rotation_from_coordinate (coordinate_x, coordinate_y, view_zoom);+			+			rotation_position_x = coordinate_x;+			rotation_position_y = coordinate_y;+			+			if (on_axis) {+				double length = fabs (Path.distance (bg.img_middle_x, coordinate_x,+					bg.img_middle_y, coordinate_y));+				+				double min = double.MAX;+				double circle_edge;+				double circle_x;+				double circle_y;+				+				for (double circle_angle = 0; circle_angle < 2 * PI; circle_angle += PI / 4) {+					circle_x = bg.img_middle_x + cos (circle_angle) * length;+					circle_y = bg.img_middle_y + sin (circle_angle) * length;+					+					circle_edge = fabs (Path.distance (coordinate_x, circle_x, +						coordinate_y, circle_y));+					+					if (circle_edge < min) {+						rotation_position_x = circle_x;+						rotation_position_y = circle_y;+						min = circle_edge;+					}+				}+			}+			+			bg.preview_img_rotation_from_coordinate (rotation_position_x, rotation_position_y, view_zoom); 		} 		+		// resize handle 		if (bg.selected_handle == 1) { 			xscale = img_scale_x * ((img_width - dx) / img_width);	 			yscale = xscale;diff --git a/libbirdfont/HiddenTools.vala b/libbirdfont/HiddenTools.valaindex dc45c98..8d40be5 100644--- a/libbirdfont/HiddenTools.vala+++ b/libbirdfont/HiddenTools.vala@@ -67,6 +67,8 @@ public class HiddenTools : ToolCollection  { 				DrawingTools.bezier_tool.move_handle_on_axis (); 			} else if (t is PenTool || t is PointTool) { 				PenTool.move_handle_on_axis ();+			} else if (t is BackgroundTool) {+				BackgroundTool.move_handle_on_axis (); 			} 		}); 		move_along_axis.is_tool_modifier = true;diff --git a/libbirdfont/MoveTool.vala b/libbirdfont/MoveTool.valaindex 58df39b..4311179 100644--- a/libbirdfont/MoveTool.vala+++ b/libbirdfont/MoveTool.vala@@ -37,8 +37,8 @@ public class MoveTool : Tool { 	public signal void objects_moved (); 	public signal void objects_deselected (); 	-	public MoveTool (string n) {-		base (n, t_("Move paths"));+	public MoveTool (string name) {+		base (name, t_("Move paths"));  		selection_changed.connect (() => { 			update_selection_boundaries ();diff --git a/libbirdfont/PointTool.vala b/libbirdfont/PointTool.valaindex 1886015..83e4658 100644--- a/libbirdfont/PointTool.vala+++ b/libbirdfont/PointTool.vala@@ -21,7 +21,7 @@ namespace BirdFont { public class PointTool : Tool { 	 	public PointTool (string name) {-		base (name, t_ ("Move control points"));+		base (name, "");  		select_action.connect ((self) => { 		});@@ -79,6 +79,16 @@ public class PointTool : Tool { 			p.draw_action (p, cairo_context, glyph); 		}); 	}++	public override string get_tip () {+		string tip = t_ ("Move control points") + "\n";+		+		tip += HiddenTools.move_along_axis.get_key_binding ();+		tip += " - ";+		tip += t_ ("on axis") + "\n";+				+		return tip;+	} 	 	public static Tool pen () { 		return MainWindow.get_toolbox ().get_tool ("pen_tool");