[vala/wip/goocanvas: 18/18] SQUASH Make CanvasBounds a struct



commit 07049152b3c48c4ab977221db12aa2f7802ac7e2
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Jan 30 09:14:34 2019 +0100

    SQUASH Make CanvasBounds a struct

 vapi/goocanvas-2.0.vapi              | 19 +++++++++----------
 vapi/metadata/GooCanvas-2.0.metadata |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/vapi/goocanvas-2.0.vapi b/vapi/goocanvas-2.0.vapi
index c960ed451..957e49f96 100644
--- a/vapi/goocanvas-2.0.vapi
+++ b/vapi/goocanvas-2.0.vapi
@@ -97,14 +97,6 @@ namespace Goo {
                [CCode (has_construct_function = false)]
                protected CanvasAccessibleFactory ();
        }
-       [CCode (cheader_filename = "goocanvas.h", copy_function = "g_boxed_copy", free_function = 
"g_boxed_free", type_id = "goo_canvas_bounds_get_type ()")]
-       [Compact]
-       public class CanvasBounds {
-               public double x1;
-               public double x2;
-               public double y1;
-               public double y2;
-       }
        [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_ellipse_get_type ()")]
        public class CanvasEllipse : Goo.CanvasItemSimple, Goo.CanvasItem {
                public Goo.CanvasEllipseData ellipse_data;
@@ -414,7 +406,7 @@ namespace Goo {
        }
        [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_item_simple_get_type ()")]
        public class CanvasItemSimple : GLib.Object, Goo.CanvasItem {
-               public weak Goo.CanvasBounds bounds;
+               public Goo.CanvasBounds bounds;
                public weak Goo.Canvas canvas;
                public weak Goo.CanvasItemModelSimple model;
                public uint need_entire_subtree_update;
@@ -798,7 +790,7 @@ namespace Goo {
                public static (unowned GLib.ParamSpec)[] class_list_child_properties (GLib.ObjectClass 
iclass);
                public void ensure_updated ();
                public int find_child (Goo.CanvasItem child);
-               public abstract void get_bounds (out unowned Goo.CanvasBounds bounds);
+               public abstract void get_bounds (out Goo.CanvasBounds bounds);
                public abstract unowned Goo.Canvas get_canvas ();
                public abstract unowned Goo.CanvasItem get_child (int child_num);
                public void get_child_properties (Goo.CanvasItem child, ...);
@@ -942,6 +934,13 @@ namespace Goo {
                public virtual signal void child_notify (GLib.ParamSpec pspec);
                public virtual signal void child_removed (int child_num);
        }
+       [CCode (cheader_filename = "goocanvas.h", type_id = "goo_canvas_bounds_get_type ()")]
+       public struct CanvasBounds {
+               public double x1;
+               public double y1;
+               public double x2;
+               public double y2;
+       }
        [CCode (cheader_filename = "goocanvas.h", has_type_id = false)]
        public struct CanvasEllipseData {
                public double center_x;
diff --git a/vapi/metadata/GooCanvas-2.0.metadata b/vapi/metadata/GooCanvas-2.0.metadata
index 1ad5a6621..423957285 100644
--- a/vapi/metadata/GooCanvas-2.0.metadata
+++ b/vapi/metadata/GooCanvas-2.0.metadata
@@ -2,6 +2,9 @@
 * skip=false
 *.* skip=false
 
+CanvasBounds struct
+*.get_*bounds return_void
+
 CairoMatrix skip
 cairo_matrix_* skip
 *.transform type="Cairo.Matrix?"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]