Add context menu options to all elements

sapoturge · Oct 23, 2024 · 53455a4 · 53455a4
1 parent c40dab7
commit 53455a4
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 7 deletions.
diff --git a/src/data/Circle.vala b/src/data/Circle.vala
@@ -128,11 +128,23 @@ public class Circle : Element {
     }
 
     public override Gee.List<ContextOption> options () {
-        return new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
+        var opts = new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
             new ContextOption.deleter (_("Delete Circle"), () => { request_delete(); }),
             new ContextOption.action (_("Convert to Ellipse"), () => { replace (new Ellipse (x, y, r, r, fill, stroke, title, transform)); }),
             new ContextOption.toggle (_("Show Transformation"), this, "transform_enabled")
         });
+        if (transform_enabled && transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 
     public override int add_svg (Xml.Node* root, Xml.Node* defs, int pattern_index) {

diff --git a/src/data/Ellipse.vala b/src/data/Ellipse.vala
@@ -211,7 +211,7 @@ public class Ellipse : Element {
     }
 
     public override Gee.List<ContextOption> options () {
-        return new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
+        var opts = new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
             new ContextOption.deleter (_("Delete Ellipse"), () => { request_delete(); }),
             new ContextOption.action (_("Convert to Path"), () => { 
                 replace (new Path.with_pattern ({
@@ -223,6 +223,18 @@ public class Ellipse : Element {
             }),
             new ContextOption.toggle (_("Show Transformation"), this, "transform_enabled")
         });
+        if (transform_enabled && transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 
     public override int add_svg (Xml.Node* root, Xml.Node* defs, int pattern_index) {

diff --git a/src/data/Group.vala b/src/data/Group.vala
@@ -104,7 +104,18 @@ public class Group : Element, Container {
     }
 
     public override Gee.List<ContextOption> options () {
-        // Groups have no inherent options.
-        return new Gee.ArrayList<ContextOption> ();
+        var opts = new Gee.ArrayList<ContextOption> ();
+        if (transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 }
diff --git a/src/data/Line.vala b/src/data/Line.vala
@@ -90,13 +90,25 @@ public class Line : Element {
     }
 
     public override Gee.List<ContextOption> options () {
-        return new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
+        var opts = new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
             new ContextOption.deleter (_("Delete Line"), () => { request_delete(); }),
             new ContextOption.action (_("Convert to Polyline"), () => {
                 replace (new Polyline ({start, end}, fill, stroke, title, transform));
             }),
             new ContextOption.toggle (_("Show Transformation"), this, "transform_enabled")
         });
+        if (transform_enabled && transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 
     public override int add_svg (Xml.Node* root, Xml.Node* defs, int pattern_index) {

diff --git a/src/data/Polygon.vala b/src/data/Polygon.vala
@@ -152,7 +152,7 @@ public class Polygon : Element {
     }
 
     public override Gee.List<ContextOption> options () {
-        return new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
+        var opts = new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
             new ContextOption.deleter (_("Delete Polygon"), () => { request_delete(); }),
             new ContextOption.action (_("Convert to Path"), () => {
                 var segments = new PathSegment[] {};
@@ -166,6 +166,18 @@ public class Polygon : Element {
             }),
             new ContextOption.toggle (_("Show Transformation"), this, "transform_enabled")
         });
+        if (transform_enabled && transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 
     public override int add_svg (Xml.Node* root, Xml.Node* defs, int pattern_index) {

diff --git a/src/data/Polyline.vala b/src/data/Polyline.vala
@@ -155,7 +155,7 @@ public class Polyline : Element {
     }
 
     public override Gee.List<ContextOption> options () {
-        return new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
+        var opts = new Gee.ArrayList<ContextOption>.wrap (new ContextOption[]{
             new ContextOption.deleter (_("Delete Polyline"), () => { request_delete(); }),
             new ContextOption.action (_("Close Loop"), () => {
                 var points = new Point[] {root_segment.start};
@@ -167,6 +167,18 @@ public class Polyline : Element {
             }),
             new ContextOption.toggle (_("Show Transformation"), this, "transform_enabled")
         });
+        if (transform_enabled && transform_applied) {
+            opts.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            opts.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
+
+        return opts;
     }
 
     public override int add_svg (Xml.Node* root, Xml.Node* defs, int pattern_index) {

diff --git a/src/data/Rectangle.vala b/src/data/Rectangle.vala
@@ -493,6 +493,16 @@ public class Rectangle : Element {
                 replace (new Polygon ({Point(x, y), Point(x+width, y), Point(x + width, y + height), Point(x, y + height)}, fill, stroke, title, transform));
             }));
         }
+        if (transform_enabled && transform_applied) {
+            options.add (new ContextOption.action (_("Revert View"), () => {
+                apply_transform (new Transform.identity(), null);
+            }));
+        } else if (transform_enabled) {
+            options.add (new ContextOption.action (_("Apply Transformation"), () => {
+                apply_transform (transform.invert (), this);
+                transform_applied = true;
+            }));
+        }
 
         return options;
     }