goocanvas: Update from 1.0.0+af07af5d

diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index a7591c810323b2cbb5bac186a8f4d730c73e2309..59a20926778791e29a1ee1319ab9b18980ff2c7f 100644 (file)
--- a/vapi/goocanvas.vapi
+++ b/vapi/goocanvas.vapi
@@ -20,6 +20,7 @@ namespace Goo {
        }
        [CCode (cheader_filename = "goocanvas.h")]
        public class Canvas : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+               public uint before_initial_expose;
                [CCode (has_construct_function = false)]
                public Canvas ();
                public void convert_bounds_to_item_space (Goo.CanvasItem item, ref Goo.CanvasBounds bounds);
@@ -27,10 +28,12 @@ namespace Goo {
                public void convert_from_pixels (ref double x, ref double y);
                public void convert_to_item_space (Goo.CanvasItem item, ref double x, ref double y);
                public void convert_to_pixels (ref double x, ref double y);
+               public void convert_units_from_pixels (ref double x, ref double y);
+               public void convert_units_to_pixels (ref double x, ref double y);
                public unowned Cairo.Context create_cairo_context ();
                public virtual unowned Goo.CanvasItem create_item (Goo.CanvasItemModel model);
                public static void create_path (GLib.Array<Goo.CanvasPathCommand?> commands, Cairo.Context cr);
-               public void get_bounds (out unowned double? left, out unowned double? top, out unowned double? right, out unowned double? bottom);
+               public void get_bounds (out double left, out double top, out double right, out double bottom);
                public double get_default_line_width ();
                public unowned Goo.CanvasItem? get_item (Goo.CanvasItemModel model);
                public unowned Goo.CanvasItem? get_item_at (double x, double y, bool is_pointer_event);
@@ -303,6 +306,8 @@ namespace Goo {
                [CCode (cname = "goo_canvas_image_new", type = "GooCanvasItem*")]
                public static unowned Goo.CanvasImage create (Goo.CanvasItem? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
                [NoAccessorMethod]
+               public double alpha { get; set; }
+               [NoAccessorMethod]
                public double height { get; set; }
                [NoAccessorMethod]
                public Goo.CairoPattern pattern { owned get; set; }
@@ -324,6 +329,8 @@ namespace Goo {
                [CCode (cname = "goo_canvas_image_model_new", type = "GooCanvasItemModel*")]
                public static unowned Goo.CanvasImageModel create (Goo.CanvasItemModel? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
                [NoAccessorMethod]
+               public double alpha { get; set; }
+               [NoAccessorMethod]
                public double height { get; set; }
                [NoAccessorMethod]
                public Goo.CairoPattern pattern { owned get; set; }
@@ -782,6 +789,7 @@ namespace Goo {
                public abstract int get_n_children ();
                public abstract unowned Goo.CanvasItem? get_parent ();
                public abstract bool get_requested_area (Cairo.Context cr, out Goo.CanvasBounds requested_area);
+               public abstract bool get_requested_area_for_width (Cairo.Context cr, double width, out Goo.CanvasBounds requested_area);
                public abstract double get_requested_height (Cairo.Context cr, double width);
                public bool get_simple_transform (out double x, out double y, out double scale, out double rotation);
                public abstract unowned Goo.CanvasStyle get_style ();

diff --git a/vapi/packages/goocanvas/goocanvas.gi b/vapi/packages/goocanvas/goocanvas.gi
index 735ebf39447d872dd804168db119b11473ba1daf..21933450830fe2c6f6ee46b4f3d77d181b8e17b5 100644 (file)
--- a/vapi/packages/goocanvas/goocanvas.gi
+++ b/vapi/packages/goocanvas/goocanvas.gi
@@ -311,6 +311,22 @@
                                        <parameter name="y" type="gdouble*"/>
                                </parameters>
                        </method>
+                       <method name="convert_units_from_pixels" symbol="goo_canvas_convert_units_from_pixels">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="canvas" type="GooCanvas*"/>
+                                       <parameter name="x" type="gdouble*"/>
+                                       <parameter name="y" type="gdouble*"/>
+                               </parameters>
+                       </method>
+                       <method name="convert_units_to_pixels" symbol="goo_canvas_convert_units_to_pixels">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="canvas" type="GooCanvas*"/>
+                                       <parameter name="x" type="gdouble*"/>
+                                       <parameter name="y" type="gdouble*"/>
+                               </parameters>
+                       </method>
                        <method name="create_cairo_context" symbol="goo_canvas_create_cairo_context">
                                <return-type type="cairo_t*"/>
                                <parameters>
@@ -685,6 +701,7 @@
                        <field name="bounds_from_origin" type="guint"/>
                        <field name="clear_background" type="guint"/>
                        <field name="redraw_when_scrolled" type="guint"/>
+                       <field name="before_initial_expose" type="guint"/>
                        <field name="bounds_padding" type="gdouble"/>
                        <field name="pointer_item" type="GooCanvasItem*"/>
                        <field name="pointer_grab_item" type="GooCanvasItem*"/>
@@ -893,6 +910,7 @@
                                        <parameter name="y" type="gdouble"/>
                                </parameters>
                        </constructor>
+                       <property name="alpha" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="height" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="pattern" type="GooCairoPattern*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="pixbuf" type="GdkPixbuf*" readable="0" writable="1" construct="0" construct-only="0"/>
@@ -915,6 +933,7 @@
                                        <parameter name="y" type="gdouble"/>
                                </parameters>
                        </constructor>
+                       <property name="alpha" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="height" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="pattern" type="GooCairoPattern*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="pixbuf" type="GdkPixbuf*" readable="0" writable="1" construct="0" construct-only="0"/>
@@ -1582,6 +1601,15 @@
                                        <parameter name="requested_area" type="GooCanvasBounds*"/>
                                </parameters>
                        </method>
+                       <method name="get_requested_area_for_width" symbol="goo_canvas_item_get_requested_area_for_width">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="item" type="GooCanvasItem*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="requested_area" type="GooCanvasBounds*"/>
+                               </parameters>
+                       </method>
                        <method name="get_requested_height" symbol="goo_canvas_item_get_requested_height">
                                <return-type type="gdouble"/>
                                <parameters>
@@ -2031,6 +2059,15 @@
                                        <parameter name="requested_area" type="GooCanvasBounds*"/>
                                </parameters>
                        </vfunc>
+                       <vfunc name="get_requested_area_for_width">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="item" type="GooCanvasItem*"/>
+                                       <parameter name="cr" type="cairo_t*"/>
+                                       <parameter name="width" type="gdouble"/>
+                                       <parameter name="requested_area" type="GooCanvasBounds*"/>
+                               </parameters>
+                       </vfunc>
                        <vfunc name="get_requested_height">
                                <return-type type="gdouble"/>
                                <parameters>

diff --git a/vapi/packages/goocanvas/goocanvas.metadata b/vapi/packages/goocanvas/goocanvas.metadata
index 1fbd42aa68a471011ac7a9ac28a70216631c9253..42689517210370ed17e9bb33568d92b27cd3cde2 100644 (file)
--- a/vapi/packages/goocanvas/goocanvas.metadata
+++ b/vapi/packages/goocanvas/goocanvas.metadata
@@ -50,11 +50,15 @@ goo_canvas_convert_from_pixels.x is_ref="1"
 goo_canvas_convert_from_pixels.y is_ref="1"
 goo_canvas_convert_to_pixels.x is_ref="1"
 goo_canvas_convert_to_pixels.y is_ref="1"
+goo_canvas_convert_units_from_pixels.x is_ref="1"
+goo_canvas_convert_units_from_pixels.y is_ref="1"
+goo_canvas_convert_units_to_pixels.x is_ref="1"
+goo_canvas_convert_units_to_pixels.y is_ref="1"
 goo_canvas_create_path hidden="1"
-goo_canvas_get_bounds.left is_out="1" nullable="1"
-goo_canvas_get_bounds.top is_out="1" nullable="1"
-goo_canvas_get_bounds.right is_out="1" nullable="1"
-goo_canvas_get_bounds.bottom is_out="1" nullable="1"
+goo_canvas_get_bounds.left is_out="1"
+goo_canvas_get_bounds.top is_out="1"
+goo_canvas_get_bounds.right is_out="1"
+goo_canvas_get_bounds.bottom is_out="1"
 goo_canvas_get_root_item nullable="1"
 goo_canvas_get_root_item_model nullable="1"
 goo_canvas_get_static_root_item nullable="1"
@@ -179,6 +183,7 @@ goo_canvas_item_get_items_at hidden="1"
 goo_canvas_item_get_model nullable="1"
 goo_canvas_item_get_parent nullable="1"
 goo_canvas_item_get_requested_area.requested_area is_out="1"
+goo_canvas_item_get_requested_area_for_width.requested_area is_out="1"
 goo_canvas_item_get_simple_transform.x is_out="1"
 goo_canvas_item_get_simple_transform.y is_out="1"
 goo_canvas_item_get_simple_transform.scale is_out="1"