Skip to content

Commit 1680494

Browse files
bilelmoussaouibilelmoussaoui
committed
Generate new 4.20 types
1 parent ea732db commit 1680494

19 files changed

+462
-80
lines changed

‎gdk4/Gir.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ generate = [
6262
"Gdk.TextureDownloader",
6363
"Gdk.TextureError",
6464
"Gdk.TitlebarGesture",
65+
"Gdk.ToplevelCapabilities",
6566
"Gdk.ToplevelLayout",
6667
"Gdk.TouchEvent",
6768
"Gdk.TouchpadEvent",
@@ -144,11 +145,11 @@ status = "generate"
144145
[[object.function]]
145146
name = "pango_layout_get_clip_region"
146147
manual = true
147-
doc_ignore_parameters = ["n_ranges"]
148+
doc_ignore_parameters = ["n_ranges"]
148149
[[object.function]]
149150
name = "pango_layout_line_get_clip_region"
150151
manual = true
151-
doc_ignore_parameters = ["n_ranges"]
152+
doc_ignore_parameters = ["n_ranges"]
152153
[[object.function]]
153154
name = "content_register_deserializer"
154155
manual = true

‎gdk4/src/auto/flags.rs

+132
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,138 @@ impl From<SeatCapabilities> for glib::Value {
803803
}
804804
}
805805

806+
#[cfg(feature = "v4_20")]
807+
bitflags! {
808+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
809+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
810+
#[doc(alias = "GdkToplevelCapabilities")]
811+
pub struct ToplevelCapabilities: u32 {
812+
#[cfg(feature = "v4_20")]
813+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
814+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_EDGE_CONSTRAINTS")]
815+
const EDGE_CONSTRAINTS = ffi::GDK_TOPLEVEL_CAPABILITIES_EDGE_CONSTRAINTS as _;
816+
#[cfg(feature = "v4_20")]
817+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
818+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_INHIBIT_SHORTCUTS")]
819+
const INHIBIT_SHORTCUTS = ffi::GDK_TOPLEVEL_CAPABILITIES_INHIBIT_SHORTCUTS as _;
820+
#[cfg(feature = "v4_20")]
821+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
822+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_TITLEBAR_GESTURES")]
823+
const TITLEBAR_GESTURES = ffi::GDK_TOPLEVEL_CAPABILITIES_TITLEBAR_GESTURES as _;
824+
#[cfg(feature = "v4_20")]
825+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
826+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_WINDOW_MENU")]
827+
const WINDOW_MENU = ffi::GDK_TOPLEVEL_CAPABILITIES_WINDOW_MENU as _;
828+
#[cfg(feature = "v4_20")]
829+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
830+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_MAXIMIZE")]
831+
const MAXIMIZE = ffi::GDK_TOPLEVEL_CAPABILITIES_MAXIMIZE as _;
832+
#[cfg(feature = "v4_20")]
833+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
834+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_FULLSCREEN")]
835+
const FULLSCREEN = ffi::GDK_TOPLEVEL_CAPABILITIES_FULLSCREEN as _;
836+
#[cfg(feature = "v4_20")]
837+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
838+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_MINIMIZE")]
839+
const MINIMIZE = ffi::GDK_TOPLEVEL_CAPABILITIES_MINIMIZE as _;
840+
#[cfg(feature = "v4_20")]
841+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
842+
#[doc(alias = "GDK_TOPLEVEL_CAPABILITIES_LOWER")]
843+
const LOWER = ffi::GDK_TOPLEVEL_CAPABILITIES_LOWER as _;
844+
}
845+
}
846+
847+
#[cfg(feature = "v4_20")]
848+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
849+
#[doc(hidden)]
850+
impl IntoGlib for ToplevelCapabilities {
851+
type GlibType = ffi::GdkToplevelCapabilities;
852+
853+
#[inline]
854+
fn into_glib(self) -> ffi::GdkToplevelCapabilities {
855+
self.bits()
856+
}
857+
}
858+
859+
#[cfg(feature = "v4_20")]
860+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
861+
#[doc(hidden)]
862+
impl FromGlib<ffi::GdkToplevelCapabilities> for ToplevelCapabilities {
863+
#[inline]
864+
unsafe fn from_glib(value: ffi::GdkToplevelCapabilities) -> Self {
865+
skip_assert_initialized!();
866+
Self::from_bits_truncate(value)
867+
}
868+
}
869+
870+
#[cfg(feature = "v4_20")]
871+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
872+
impl StaticType for ToplevelCapabilities {
873+
#[inline]
874+
#[doc(alias = "gdk_toplevel_capabilities_get_type")]
875+
fn static_type() -> glib::Type {
876+
unsafe { from_glib(ffi::gdk_toplevel_capabilities_get_type()) }
877+
}
878+
}
879+
880+
#[cfg(feature = "v4_20")]
881+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
882+
impl glib::HasParamSpec for ToplevelCapabilities {
883+
type ParamSpec = glib::ParamSpecFlags;
884+
type SetValue = Self;
885+
type BuilderFn = fn(&str) -> glib::ParamSpecFlagsBuilder<Self>;
886+
887+
fn param_spec_builder() -> Self::BuilderFn {
888+
Self::ParamSpec::builder
889+
}
890+
}
891+
892+
#[cfg(feature = "v4_20")]
893+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
894+
impl glib::value::ValueType for ToplevelCapabilities {
895+
type Type = Self;
896+
}
897+
898+
#[cfg(feature = "v4_20")]
899+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
900+
unsafe impl<'a> glib::value::FromValue<'a> for ToplevelCapabilities {
901+
type Checker = glib::value::GenericValueTypeChecker<Self>;
902+
903+
#[inline]
904+
unsafe fn from_value(value: &'a glib::Value) -> Self {
905+
skip_assert_initialized!();
906+
from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0))
907+
}
908+
}
909+
910+
#[cfg(feature = "v4_20")]
911+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
912+
impl ToValue for ToplevelCapabilities {
913+
#[inline]
914+
fn to_value(&self) -> glib::Value {
915+
let mut value = glib::Value::for_value_type::<Self>();
916+
unsafe {
917+
glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib());
918+
}
919+
value
920+
}
921+
922+
#[inline]
923+
fn value_type(&self) -> glib::Type {
924+
Self::static_type()
925+
}
926+
}
927+
928+
#[cfg(feature = "v4_20")]
929+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
930+
impl From<ToplevelCapabilities> for glib::Value {
931+
#[inline]
932+
fn from(v: ToplevelCapabilities) -> Self {
933+
skip_assert_initialized!();
934+
ToValue::to_value(&v)
935+
}
936+
}
937+
806938
bitflags! {
807939
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
808940
#[doc(alias = "GdkToplevelState")]

‎gdk4/src/auto/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ pub use self::flags::FrameClockPhase;
263263
pub use self::flags::ModifierType;
264264
pub use self::flags::PaintableFlags;
265265
pub use self::flags::SeatCapabilities;
266+
#[cfg(feature = "v4_20")]
267+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
268+
pub use self::flags::ToplevelCapabilities;
266269
pub use self::flags::ToplevelState;
267270
#[cfg(feature = "v4_6")]
268271
#[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]

‎gdk4/src/auto/toplevel.rs

+14-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5-
#[cfg(feature = "v4_20")]
6-
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
7-
use crate::Gravity;
85
#[cfg(feature = "v4_4")]
96
#[cfg_attr(docsrs, doc(cfg(feature = "v4_4")))]
107
use crate::TitlebarGesture;
118
use crate::{
129
ffi, Device, Event, FullscreenMode, Surface, SurfaceEdge, Texture, ToplevelLayout,
1310
ToplevelState,
1411
};
12+
#[cfg(feature = "v4_20")]
13+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
14+
use crate::{Gravity, ToplevelCapabilities};
1515
use glib::{
1616
prelude::*,
1717
signal::{connect_raw, SignalHandlerId},
@@ -77,13 +77,17 @@ pub trait ToplevelExt: IsA<Toplevel> + 'static {
7777
}
7878
}
7979

80-
//#[cfg(feature = "v4_20")]
81-
//#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
82-
//#[doc(alias = "gdk_toplevel_get_capabilities")]
83-
//#[doc(alias = "get_capabilities")]
84-
//fn capabilities(&self) -> /*Ignored*/ToplevelCapabilities {
85-
// unsafe { TODO: call ffi:gdk_toplevel_get_capabilities() }
86-
//}
80+
#[cfg(feature = "v4_20")]
81+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
82+
#[doc(alias = "gdk_toplevel_get_capabilities")]
83+
#[doc(alias = "get_capabilities")]
84+
fn capabilities(&self) -> ToplevelCapabilities {
85+
unsafe {
86+
from_glib(ffi::gdk_toplevel_get_capabilities(
87+
self.as_ref().to_glib_none().0,
88+
))
89+
}
90+
}
8791

8892
#[cfg(feature = "v4_20")]
8993
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]

‎gtk4/Gir.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ generate = [
144144
"Gtk.IconViewDropPosition",
145145
"Gtk.ImageType",
146146
"Gtk.IMContext",
147-
"Gtk.IMMulticontext",
147+
"Gtk.IMMulticontext",
148148
"Gtk.InputHints",
149149
"Gtk.InputPurpose",
150150
"Gtk.Inscription",
@@ -276,6 +276,7 @@ generate = [
276276
"Gtk.Viewport",
277277
"Gtk.VolumeButton",
278278
"Gtk.WindowControls",
279+
"Gtk.WindowGravity",
279280
"Gtk.WindowGroup",
280281
"Gtk.WindowHandle",
281282
"Gtk.WrapMode",
@@ -906,7 +907,7 @@ manual_traits = ["ComboBoxExtManual"]
906907
const = true # iter shouldn't be mutable here
907908
[[object.function]]
908909
name = "set_active"
909-
manual = true # use Option<u32> so we can allow -1 to unselect the active item
910+
manual = true # use Option<u32> so we can allow -1 to unselect the active item
910911
doc_trait_name = "ComboBoxExtManual"
911912
[[object.function]]
912913
name = "get_active"
@@ -998,7 +999,7 @@ status = "generate"
998999
manual_traits = ["DialogExtManual"]
9991000
[[object.function]]
10001001
name = "add_buttons"
1001-
manual = true # to call Dialog::add_button
1002+
manual = true # to call Dialog::add_button
10021003
doc_trait_name = "DialogExtManual"
10031004
[[object.function]]
10041005
name = "new_with_buttons"
@@ -2335,7 +2336,7 @@ manual_traits = ["TreeModelExtManual"]
23352336
ignore = true # unsafe
23362337
[[object.function]]
23372338
pattern = "(get_value|get_valist)"
2338-
ignore = true # generated manually to check for column
2339+
ignore = true # generated manually to check for column
23392340
[[object.function]]
23402341
name = "get"
23412342
manual = true
@@ -2524,7 +2525,7 @@ generate_builder = false
25242525
nullable = false # use unset_select_function
25252526
[[object.function]]
25262527
name = "get_user_data"
2527-
ignore = true # unsafe
2528+
ignore = true # unsafe
25282529

25292530
[[object]]
25302531
name = "Gtk.TreeSortable"
@@ -2689,7 +2690,7 @@ status = "generate"
26892690
[[object.function]]
26902691
name = "new"
26912692
[[object.function.parameter]]
2692-
name = "uri" # we have Default for creating instances without "uri"
2693+
name = "uri" # we have Default for creating instances without "uri"
26932694
nullable = false
26942695

26952696
[[object]]

‎gtk4/src/auto/about_dialog.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5+
#[cfg(feature = "v4_20")]
6+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
7+
use crate::WindowGravity;
58
use crate::{
69
ffi, Accessible, AccessibleRole, Align, Application, Buildable, ConstraintTarget,
710
LayoutManager, License, Native, Overflow, Root, ShortcutManager, Widget, Window,
@@ -949,11 +952,14 @@ impl AboutDialogBuilder {
949952
}
950953
}
951954

952-
// #[cfg(feature = "v4_20")]
955+
#[cfg(feature = "v4_20")]
953956
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
954-
//pub fn gravity(self, gravity: /*Ignored*/WindowGravity) -> Self {
955-
// Self { builder: self.builder.property("gravity", gravity), }
956-
//}
957+
pub fn gravity(self, gravity: WindowGravity) -> Self {
958+
Self {
959+
builder: self.builder.property("gravity", gravity),
960+
}
961+
}
962+
957963
#[cfg(feature = "v4_2")]
958964
#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))]
959965
pub fn handle_menubar_accel(self, handle_menubar_accel: bool) -> Self {

‎gtk4/src/auto/application_window.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
// DO NOT EDIT
44
#![allow(deprecated)]
55

6+
#[cfg(feature = "v4_20")]
7+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
8+
use crate::WindowGravity;
69
use crate::{
710
ffi, Accessible, AccessibleRole, Align, Application, Buildable, ConstraintTarget,
811
LayoutManager, Native, Overflow, Root, ShortcutManager, ShortcutsWindow, Widget, Window,
@@ -154,11 +157,14 @@ impl ApplicationWindowBuilder {
154157
}
155158
}
156159

157-
// #[cfg(feature = "v4_20")]
160+
#[cfg(feature = "v4_20")]
158161
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
159-
//pub fn gravity(self, gravity: /*Ignored*/WindowGravity) -> Self {
160-
// Self { builder: self.builder.property("gravity", gravity), }
161-
//}
162+
pub fn gravity(self, gravity: WindowGravity) -> Self {
163+
Self {
164+
builder: self.builder.property("gravity", gravity),
165+
}
166+
}
167+
162168
#[cfg(feature = "v4_2")]
163169
#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))]
164170
pub fn handle_menubar_accel(self, handle_menubar_accel: bool) -> Self {

‎gtk4/src/auto/assistant.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
// DO NOT EDIT
44
#![allow(deprecated)]
55

6+
#[cfg(feature = "v4_20")]
7+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
8+
use crate::WindowGravity;
69
use crate::{
710
ffi, Accessible, AccessibleRole, Align, Application, AssistantPage, AssistantPageType,
811
Buildable, ConstraintTarget, LayoutManager, Native, Overflow, Root, ShortcutManager, Widget,
@@ -567,11 +570,14 @@ impl AssistantBuilder {
567570
}
568571
}
569572

570-
// #[cfg(feature = "v4_20")]
573+
#[cfg(feature = "v4_20")]
571574
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
572-
//pub fn gravity(self, gravity: /*Ignored*/WindowGravity) -> Self {
573-
// Self { builder: self.builder.property("gravity", gravity), }
574-
//}
575+
pub fn gravity(self, gravity: WindowGravity) -> Self {
576+
Self {
577+
builder: self.builder.property("gravity", gravity),
578+
}
579+
}
580+
575581
#[cfg(feature = "v4_2")]
576582
#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))]
577583
pub fn handle_menubar_accel(self, handle_menubar_accel: bool) -> Self {

‎gtk4/src/auto/color_chooser_dialog.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
// DO NOT EDIT
44
#![allow(deprecated)]
55

6+
#[cfg(feature = "v4_20")]
7+
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
8+
use crate::WindowGravity;
69
use crate::{
710
ffi, Accessible, AccessibleRole, Align, Application, Buildable, ColorChooser, ConstraintTarget,
811
Dialog, LayoutManager, Native, Overflow, Root, ShortcutManager, Widget, Window,
@@ -195,11 +198,14 @@ impl ColorChooserDialogBuilder {
195198
}
196199
}
197200

198-
// #[cfg(feature = "v4_20")]
201+
#[cfg(feature = "v4_20")]
199202
#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
200-
//pub fn gravity(self, gravity: /*Ignored*/WindowGravity) -> Self {
201-
// Self { builder: self.builder.property("gravity", gravity), }
202-
//}
203+
pub fn gravity(self, gravity: WindowGravity) -> Self {
204+
Self {
205+
builder: self.builder.property("gravity", gravity),
206+
}
207+
}
208+
203209
#[cfg(feature = "v4_2")]
204210
#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))]
205211
pub fn handle_menubar_accel(self, handle_menubar_accel: bool) -> Self {

0 commit comments

Comments
 (0)