Rotate boundaries

Changed files (3)

• modified libsvgbird/Layer.vala
• modified libsvgbird/Object.vala
• modified libsvgbird/ViewBox.vala

Diff

diff --git a/libsvgbird/Layer.vala b/libsvgbird/Layer.valaindex 9b4b095..0602436 100644--- a/libsvgbird/Layer.vala+++ b/libsvgbird/Layer.vala@@ -45,7 +45,6 @@ public class Layer : Object { 		update_view_matrix (); 	} - 	public override bool update_boundaries (Context cr) { 		if (objects.size == 0) { 			return false;diff --git a/libsvgbird/Object.vala b/libsvgbird/Object.valaindex 8df69bd..bcaee14 100644--- a/libsvgbird/Object.vala+++ b/libsvgbird/Object.vala@@ -309,10 +309,9 @@ public abstract class Object : GLib.Object { 			context.set_line_width (0); 		} 		-		draw_outline (context);-		 		view_matrix = copy_matrix (context.get_matrix ()); 		context.set_matrix (Matrix.identity ());+		draw_outline (context); 		 		if (has_stroke) { 			context.stroke_extents (out x0, out y0, out x1, out y1);@@ -320,17 +319,67 @@ public abstract class Object : GLib.Object { 			context.fill_extents (out x0, out y0, out x1, out y1); 		} +		double point_x0 = x0;+		double point_y0 = y0;+		double point_x1 = x1;+		double point_y1 = y0;+		double point_x2 = x1;+		double point_y2 = y1;+		double point_x3 = x0;+		double point_y3 = y1;+		+		view_matrix.transform_point (ref point_x0, ref point_y0);+		view_matrix.transform_point (ref point_x1, ref point_y1);+		view_matrix.transform_point (ref point_x2, ref point_y2);+		view_matrix.transform_point (ref point_x3, ref point_y3);+ 		context.fill (); 		context.restore (); -		left = x0;-		top = y0;-		right = x1;-		bottom = y1;-				+		left = min (point_x0, point_x1, point_x2, point_x3);+		top = min (point_y0, point_y1, point_y2, point_y3);+		right = max (point_x0, point_x1, point_x2, point_x3);+		bottom = max (point_y0, point_y1, point_y2, point_y3);+		 		return boundaries_width != 0; 	} +	static double min (double x0, double x1, double x2, double x3) {+		double min = x0;+		+		if (x1 < min) {+			min = x1;+		}+		+		if (x2 < min) {+			min = x2;+		}+		+		if (x3 < min) {+			min = x3;+		}+		+		return min;+	}++	static double max (double x0, double x1, double x2, double x3) {+		double max = x0;+		+		if (x1 > max) {+			max = x1;+		}+		+		if (x2 > max) {+			max = x2;+		}+		+		if (x3 > max) {+			max = x3;+		}+		+		return max;+	}+	 	public Matrix get_view_matrix () { 		return view_matrix; 	}diff --git a/libsvgbird/ViewBox.vala b/libsvgbird/ViewBox.valaindex 952c39d..5cf1e91 100644--- a/libsvgbird/ViewBox.vala+++ b/libsvgbird/ViewBox.vala@@ -95,10 +95,6 @@ public class ViewBox : GLib.Object { 		scale_x = original_width / width; 		scale_y = original_height / height; 		-		print (@"minx miny $minx $miny\n");-		print (@"scale_x > scale_y $scale_x > $scale_y\n");-		print (@"original_width $original_width $width    $original_height $height\n");-		 		bool scale_width = scale_x * original_height > scale_y * original_width; 		 		if (scale_width) {