diff --git a/Cargo.toml b/Cargo.toml index 8594eaab7aff..b68b96f3f033 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,13 +52,13 @@ gsk4-sys = { git = "https://github.com/gtk-rs/sys" } gtk4-sys = { git = "https://github.com/gtk-rs/sys" } pango-sys = { git = "https://github.com/gtk-rs/sys" } cairo-rs = { git = "https://github.com/gtk-rs/cairo" } -gio = { git = "https://github.com/gtk-rs/gio", features = ["v2_44"] } +gio = { git = "https://github.com/gtk-rs/gio", features = ["v2_46"] } glib = { git = "https://github.com/gtk-rs/glib" } gdk4 = { git = "https://github.com/bilelmoussaoui/gdk4", branch = "bilelmoussaoui/update" } graphene = { package = "graphene-rs", git = "https://github.com/gtk-rs/graphene" } gsk4 = { git = "https://github.com/bilelmoussaoui/gsk4", branch = "bilelmoussaoui/update" } gdk-pixbuf = { git = "https://github.com/gtk-rs/gdk-pixbuf" } -pango = { git = "https://github.com/gtk-rs/pango", features = ["v1_44"] } +pango = { git = "https://github.com/gtk-rs/pango", features = ["v1_46"] } [dev-dependencies] gir-format-check = "^0.1" diff --git a/Gir.toml b/Gir.toml index 54573893ae50..8bbbed1e143d 100644 --- a/Gir.toml +++ b/Gir.toml @@ -222,8 +222,6 @@ manual = [ # TODO "GLib.Scanner", #"Gsk.ColorStop", #"Gsk.ColorStop", - #"Pango.Overline", - #"Pango.Overline", "cairo.Context", "cairo.FontOptions", "cairo.RectangleInt", @@ -318,6 +316,7 @@ manual = [ "Pango.FontMap", "Pango.Language", "Pango.Layout", + "Pango.Overline", "Pango.ShowFlags", "Pango.Stretch", "Pango.Style", diff --git a/gir-files b/gir-files index 8a626fde7528..cb01ad7f0c8d 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 8a626fde7528ebb62a4d7902f201e483ca2ae05b +Subproject commit cb01ad7f0c8d319b4fcf5439706a20897d7a0707 diff --git a/src/auto/text_tag.rs b/src/auto/text_tag.rs index 4d694b3ec676..e8c9c13adbc1 100644 --- a/src/auto/text_tag.rs +++ b/src/auto/text_tag.rs @@ -77,7 +77,7 @@ pub struct TextTagBuilder { letter_spacing: Option, letter_spacing_set: Option, name: Option, - //overline: /*Unknown type*/, + overline: Option, overline_rgba: Option, overline_rgba_set: Option, overline_set: Option, @@ -241,6 +241,9 @@ impl TextTagBuilder { if let Some(ref name) = self.name { properties.push(("name", name)); } + if let Some(ref overline) = self.overline { + properties.push(("overline", overline)); + } if let Some(ref overline_rgba) = self.overline_rgba { properties.push(("overline-rgba", overline_rgba)); } @@ -562,6 +565,11 @@ impl TextTagBuilder { self } + pub fn overline(mut self, overline: pango::Overline) -> Self { + self.overline = Some(overline); + self + } + pub fn overline_rgba(mut self, overline_rgba: &gdk::RGBA) -> Self { self.overline_rgba = Some(overline_rgba.clone()); self @@ -929,9 +937,9 @@ pub trait TextTagExt: 'static { fn get_property_name(&self) -> Option; - //fn get_property_overline(&self) -> /*Ignored*/pango::Overline; + fn get_property_overline(&self) -> pango::Overline; - //fn set_property_overline(&self, overline: /*Ignored*/pango::Overline); + fn set_property_overline(&self, overline: pango::Overline); fn get_property_overline_rgba(&self) -> Option; @@ -2281,19 +2289,30 @@ impl> TextTagExt for O { } } - //fn get_property_overline(&self) -> /*Ignored*/pango::Overline { - // unsafe { - // let mut value = Value::from_type(::static_type()); - // gobject_sys::g_object_get_property(self.to_glib_none().0 as *mut gobject_sys::GObject, b"overline\0".as_ptr() as *const _, value.to_glib_none_mut().0); - // value.get().expect("Return Value for property `overline` getter").unwrap() - // } - //} + fn get_property_overline(&self) -> pango::Overline { + unsafe { + let mut value = Value::from_type(::static_type()); + gobject_sys::g_object_get_property( + self.to_glib_none().0 as *mut gobject_sys::GObject, + b"overline\0".as_ptr() as *const _, + value.to_glib_none_mut().0, + ); + value + .get() + .expect("Return Value for property `overline` getter") + .unwrap() + } + } - //fn set_property_overline(&self, overline: /*Ignored*/pango::Overline) { - // unsafe { - // gobject_sys::g_object_set_property(self.to_glib_none().0 as *mut gobject_sys::GObject, b"overline\0".as_ptr() as *const _, Value::from(&overline).to_glib_none().0); - // } - //} + fn set_property_overline(&self, overline: pango::Overline) { + unsafe { + gobject_sys::g_object_set_property( + self.to_glib_none().0 as *mut gobject_sys::GObject, + b"overline\0".as_ptr() as *const _, + Value::from(&overline).to_glib_none().0, + ); + } + } fn get_property_overline_rgba(&self) -> Option { unsafe { diff --git a/src/auto/versions.txt b/src/auto/versions.txt index 4fba242798f3..e5e20c9529e3 100644 --- a/src/auto/versions.txt +++ b/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ ad40c01) -from gir-files (https://github.com/gtk-rs/gir-files @ 8a626fd) +from gir-files (https://github.com/gtk-rs/gir-files @ cb01ad7)