From 46d4fc1173f47673cd89cdbe435930688cac3d6c Mon Sep 17 00:00:00 2001 From: david-swift Date: Fri, 19 Jul 2024 10:26:59 +0200 Subject: [PATCH] Add support for picture's content fit modifier --- .../Model/Enumerations/ContentFit.swift | 31 +++++++++++++++++++ .../Adwaita/View/Generated/ActionRow.swift | 7 ++++- Sources/Adwaita/View/Generated/Avatar.swift | 2 +- Sources/Adwaita/View/Generated/Banner.swift | 2 +- Sources/Adwaita/View/Generated/Bin.swift | 2 +- Sources/Adwaita/View/Generated/Box.swift | 2 +- Sources/Adwaita/View/Generated/Button.swift | 2 +- .../View/Generated/ButtonContent.swift | 2 +- Sources/Adwaita/View/Generated/Carousel.swift | 2 +- .../Adwaita/View/Generated/CenterBox.swift | 2 +- .../Adwaita/View/Generated/CheckButton.swift | 2 +- Sources/Adwaita/View/Generated/Clamp.swift | 2 +- Sources/Adwaita/View/Generated/ComboRow.swift | 2 +- Sources/Adwaita/View/Generated/EntryRow.swift | 2 +- .../Adwaita/View/Generated/ExpanderRow.swift | 2 +- Sources/Adwaita/View/Generated/FlowBox.swift | 2 +- .../Adwaita/View/Generated/HeaderBar.swift | 4 +-- Sources/Adwaita/View/Generated/Label.swift | 2 +- Sources/Adwaita/View/Generated/LevelBar.swift | 2 +- .../Adwaita/View/Generated/LinkButton.swift | 2 +- Sources/Adwaita/View/Generated/ListBox.swift | 2 +- Sources/Adwaita/View/Generated/Menu.swift | 2 +- .../View/Generated/NavigationView.swift | 2 +- Sources/Adwaita/View/Generated/Overlay.swift | 2 +- .../View/Generated/OverlaySplitView.swift | 2 +- .../View/Generated/PasswordEntryRow.swift | 2 +- Sources/Adwaita/View/Generated/Picture.swift | 15 ++++++++- Sources/Adwaita/View/Generated/Popover.swift | 2 +- .../View/Generated/PreferencesGroup.swift | 2 +- .../View/Generated/PreferencesPage.swift | 2 +- .../View/Generated/PreferencesRow.swift | 2 +- .../Adwaita/View/Generated/ProgressBar.swift | 2 +- .../View/Generated/ScrolledWindow.swift | 2 +- .../Adwaita/View/Generated/SearchBar.swift | 2 +- .../Adwaita/View/Generated/SearchEntry.swift | 2 +- Sources/Adwaita/View/Generated/SpinRow.swift | 2 +- Sources/Adwaita/View/Generated/Spinner.swift | 2 +- .../Adwaita/View/Generated/SplitButton.swift | 2 +- .../Adwaita/View/Generated/StatusPage.swift | 2 +- .../Adwaita/View/Generated/SwitchRow.swift | 2 +- .../Adwaita/View/Generated/ToastOverlay.swift | 2 +- .../Adwaita/View/Generated/ToggleButton.swift | 2 +- .../Adwaita/View/Generated/ToolbarView.swift | 2 +- .../Adwaita/View/Generated/WindowTitle.swift | 2 +- Sources/Generation/GIR/GIRType.swift | 2 ++ .../Generation/GenerationConfiguration.swift | 8 +++-- Tests/PictureDemo.swift | 1 - 47 files changed, 100 insertions(+), 48 deletions(-) create mode 100644 Sources/Adwaita/Model/Enumerations/ContentFit.swift diff --git a/Sources/Adwaita/Model/Enumerations/ContentFit.swift b/Sources/Adwaita/Model/Enumerations/ContentFit.swift new file mode 100644 index 0000000..2ef65fd --- /dev/null +++ b/Sources/Adwaita/Model/Enumerations/ContentFit.swift @@ -0,0 +1,31 @@ +// +// ContentFit.swift +// Adwaita +// +// Created by david-swift on 19.07.24. +// + +import CAdw + +/// Control how a content should be made to fit inside an allocation. +public enum ContentFit: UInt32 { + + /// Make the content fill the entire allocation, + /// without taking its aspect ratio in consideration. + case fill + /// Scale the content to fit the allocation, + /// while taking its aspect ratio in consideration. + case contain + /// Cover the entire allocation, + /// while taking the content aspect ratio in consideration. + case cover + /// The content is scaled down to fit the allocation, if needed, + /// otherwise its original size is used. + case scaleDown + + /// The ContentFit value as a GtkContentFit value. + var gtkValue: GtkContentFit { + .init(rawValue) + } + +} diff --git a/Sources/Adwaita/View/Generated/ActionRow.swift b/Sources/Adwaita/View/Generated/ActionRow.swift index 95a4000..88bdb1d 100644 --- a/Sources/Adwaita/View/Generated/ActionRow.swift +++ b/Sources/Adwaita/View/Generated/ActionRow.swift @@ -2,7 +2,7 @@ // ActionRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw @@ -39,6 +39,11 @@ import LevenshteinTransformations /// /// It contains subnodes `label.title` and `label.subtitle` representing /// respectively the title label and subtitle label. +/// +/// `AdwActionRow` can use the +/// [`.property`](style-classes.html#property-rows) style class to emphasize +/// the row subtitle instead of the row title, which is useful for +/// displaying read-only properties. public struct ActionRow: Widget { /// Additional update functions for type extensions. diff --git a/Sources/Adwaita/View/Generated/Avatar.swift b/Sources/Adwaita/View/Generated/Avatar.swift index 251a840..2beaf45 100644 --- a/Sources/Adwaita/View/Generated/Avatar.swift +++ b/Sources/Adwaita/View/Generated/Avatar.swift @@ -2,7 +2,7 @@ // Avatar.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Banner.swift b/Sources/Adwaita/View/Generated/Banner.swift index 9214661..df179df 100644 --- a/Sources/Adwaita/View/Generated/Banner.swift +++ b/Sources/Adwaita/View/Generated/Banner.swift @@ -2,7 +2,7 @@ // Banner.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Bin.swift b/Sources/Adwaita/View/Generated/Bin.swift index b29c7d3..3a15d5a 100644 --- a/Sources/Adwaita/View/Generated/Bin.swift +++ b/Sources/Adwaita/View/Generated/Bin.swift @@ -2,7 +2,7 @@ // Bin.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Box.swift b/Sources/Adwaita/View/Generated/Box.swift index cc7f640..26190c7 100644 --- a/Sources/Adwaita/View/Generated/Box.swift +++ b/Sources/Adwaita/View/Generated/Box.swift @@ -2,7 +2,7 @@ // Box.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Button.swift b/Sources/Adwaita/View/Generated/Button.swift index 5b0b6b0..50ba95a 100644 --- a/Sources/Adwaita/View/Generated/Button.swift +++ b/Sources/Adwaita/View/Generated/Button.swift @@ -2,7 +2,7 @@ // Button.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ButtonContent.swift b/Sources/Adwaita/View/Generated/ButtonContent.swift index 8e2cd18..cfb0da8 100644 --- a/Sources/Adwaita/View/Generated/ButtonContent.swift +++ b/Sources/Adwaita/View/Generated/ButtonContent.swift @@ -2,7 +2,7 @@ // ButtonContent.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Carousel.swift b/Sources/Adwaita/View/Generated/Carousel.swift index 877a84d..6655a0a 100644 --- a/Sources/Adwaita/View/Generated/Carousel.swift +++ b/Sources/Adwaita/View/Generated/Carousel.swift @@ -2,7 +2,7 @@ // Carousel.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/CenterBox.swift b/Sources/Adwaita/View/Generated/CenterBox.swift index 04d4ee9..e3e941b 100644 --- a/Sources/Adwaita/View/Generated/CenterBox.swift +++ b/Sources/Adwaita/View/Generated/CenterBox.swift @@ -2,7 +2,7 @@ // CenterBox.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/CheckButton.swift b/Sources/Adwaita/View/Generated/CheckButton.swift index 34f6773..a608cc3 100644 --- a/Sources/Adwaita/View/Generated/CheckButton.swift +++ b/Sources/Adwaita/View/Generated/CheckButton.swift @@ -2,7 +2,7 @@ // CheckButton.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Clamp.swift b/Sources/Adwaita/View/Generated/Clamp.swift index b33f4f3..752f3b8 100644 --- a/Sources/Adwaita/View/Generated/Clamp.swift +++ b/Sources/Adwaita/View/Generated/Clamp.swift @@ -2,7 +2,7 @@ // Clamp.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ComboRow.swift b/Sources/Adwaita/View/Generated/ComboRow.swift index 02b07a2..2f2223d 100644 --- a/Sources/Adwaita/View/Generated/ComboRow.swift +++ b/Sources/Adwaita/View/Generated/ComboRow.swift @@ -2,7 +2,7 @@ // ComboRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/EntryRow.swift b/Sources/Adwaita/View/Generated/EntryRow.swift index c44b6bb..71069fe 100644 --- a/Sources/Adwaita/View/Generated/EntryRow.swift +++ b/Sources/Adwaita/View/Generated/EntryRow.swift @@ -2,7 +2,7 @@ // EntryRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ExpanderRow.swift b/Sources/Adwaita/View/Generated/ExpanderRow.swift index 48dc5c8..b469f0e 100644 --- a/Sources/Adwaita/View/Generated/ExpanderRow.swift +++ b/Sources/Adwaita/View/Generated/ExpanderRow.swift @@ -2,7 +2,7 @@ // ExpanderRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/FlowBox.swift b/Sources/Adwaita/View/Generated/FlowBox.swift index b9ad100..3816414 100644 --- a/Sources/Adwaita/View/Generated/FlowBox.swift +++ b/Sources/Adwaita/View/Generated/FlowBox.swift @@ -2,7 +2,7 @@ // FlowBox.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/HeaderBar.swift b/Sources/Adwaita/View/Generated/HeaderBar.swift index 5ce4174..0ca5252 100644 --- a/Sources/Adwaita/View/Generated/HeaderBar.swift +++ b/Sources/Adwaita/View/Generated/HeaderBar.swift @@ -2,7 +2,7 @@ // HeaderBar.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw @@ -40,7 +40,7 @@ import LevenshteinTransformations /// /// ## Split View Integration /// -/// When placed inside `AdwNavigationSplitView` or `AdwOverlaySplitView`, +/// When placed inside [class@NavigationSplitView] or [class@OverlaySplitView], /// `AdwHeaderBar` will automatically hide the title buttons other than at the /// edges of the window. /// diff --git a/Sources/Adwaita/View/Generated/Label.swift b/Sources/Adwaita/View/Generated/Label.swift index ab461c0..0a96c5a 100644 --- a/Sources/Adwaita/View/Generated/Label.swift +++ b/Sources/Adwaita/View/Generated/Label.swift @@ -2,7 +2,7 @@ // Label.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/LevelBar.swift b/Sources/Adwaita/View/Generated/LevelBar.swift index b7595c2..684a575 100644 --- a/Sources/Adwaita/View/Generated/LevelBar.swift +++ b/Sources/Adwaita/View/Generated/LevelBar.swift @@ -2,7 +2,7 @@ // LevelBar.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/LinkButton.swift b/Sources/Adwaita/View/Generated/LinkButton.swift index 82e3c43..eb04ba6 100644 --- a/Sources/Adwaita/View/Generated/LinkButton.swift +++ b/Sources/Adwaita/View/Generated/LinkButton.swift @@ -2,7 +2,7 @@ // LinkButton.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ListBox.swift b/Sources/Adwaita/View/Generated/ListBox.swift index ee44383..f8aba54 100644 --- a/Sources/Adwaita/View/Generated/ListBox.swift +++ b/Sources/Adwaita/View/Generated/ListBox.swift @@ -2,7 +2,7 @@ // ListBox.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Menu.swift b/Sources/Adwaita/View/Generated/Menu.swift index 77c6359..ffdcc8b 100644 --- a/Sources/Adwaita/View/Generated/Menu.swift +++ b/Sources/Adwaita/View/Generated/Menu.swift @@ -2,7 +2,7 @@ // Menu.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/NavigationView.swift b/Sources/Adwaita/View/Generated/NavigationView.swift index 3d68800..0842f53 100644 --- a/Sources/Adwaita/View/Generated/NavigationView.swift +++ b/Sources/Adwaita/View/Generated/NavigationView.swift @@ -2,7 +2,7 @@ // NavigationView.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Overlay.swift b/Sources/Adwaita/View/Generated/Overlay.swift index 8991678..7170b67 100644 --- a/Sources/Adwaita/View/Generated/Overlay.swift +++ b/Sources/Adwaita/View/Generated/Overlay.swift @@ -2,7 +2,7 @@ // Overlay.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/OverlaySplitView.swift b/Sources/Adwaita/View/Generated/OverlaySplitView.swift index 5a9a757..890e94a 100644 --- a/Sources/Adwaita/View/Generated/OverlaySplitView.swift +++ b/Sources/Adwaita/View/Generated/OverlaySplitView.swift @@ -2,7 +2,7 @@ // OverlaySplitView.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift index 2ceced9..7bc30aa 100644 --- a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift +++ b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift @@ -2,7 +2,7 @@ // PasswordEntryRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Picture.swift b/Sources/Adwaita/View/Generated/Picture.swift index 4e0d18b..ebe0b8e 100644 --- a/Sources/Adwaita/View/Generated/Picture.swift +++ b/Sources/Adwaita/View/Generated/Picture.swift @@ -2,7 +2,7 @@ // Picture.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw @@ -69,6 +69,8 @@ public struct Picture: Widget { var alternativeText: String? /// If the `GtkPicture` can be made smaller than the natural size of its contents. var canShrink: Bool? + /// How the content should be resized to fit inside the `GtkPicture`. + var contentFit: ContentFit? /// Whether the GtkPicture will render its contents trying to preserve the aspect /// ratio. var keepAspectRatio: Bool? @@ -108,6 +110,9 @@ public struct Picture: Widget { if let canShrink, updateProperties { gtk_picture_set_can_shrink(widget, canShrink.cBool) } + if let contentFit, updateProperties { + gtk_picture_set_content_fit(widget, contentFit.gtkValue) + } if let keepAspectRatio, updateProperties { gtk_picture_set_keep_aspect_ratio(widget, keepAspectRatio.cBool) } @@ -145,6 +150,14 @@ public struct Picture: Widget { return newSelf } + /// How the content should be resized to fit inside the `GtkPicture`. + public func contentFit(_ contentFit: ContentFit?) -> Self { + var newSelf = self + newSelf.contentFit = contentFit + + return newSelf + } + /// Whether the GtkPicture will render its contents trying to preserve the aspect /// ratio. public func keepAspectRatio(_ keepAspectRatio: Bool? = true) -> Self { diff --git a/Sources/Adwaita/View/Generated/Popover.swift b/Sources/Adwaita/View/Generated/Popover.swift index 6617fe3..d832ee1 100644 --- a/Sources/Adwaita/View/Generated/Popover.swift +++ b/Sources/Adwaita/View/Generated/Popover.swift @@ -2,7 +2,7 @@ // Popover.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesGroup.swift b/Sources/Adwaita/View/Generated/PreferencesGroup.swift index f0df35d..98267c8 100644 --- a/Sources/Adwaita/View/Generated/PreferencesGroup.swift +++ b/Sources/Adwaita/View/Generated/PreferencesGroup.swift @@ -2,7 +2,7 @@ // PreferencesGroup.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesPage.swift b/Sources/Adwaita/View/Generated/PreferencesPage.swift index b6a5fa9..c6bee4e 100644 --- a/Sources/Adwaita/View/Generated/PreferencesPage.swift +++ b/Sources/Adwaita/View/Generated/PreferencesPage.swift @@ -2,7 +2,7 @@ // PreferencesPage.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesRow.swift b/Sources/Adwaita/View/Generated/PreferencesRow.swift index cab1b44..bf10d85 100644 --- a/Sources/Adwaita/View/Generated/PreferencesRow.swift +++ b/Sources/Adwaita/View/Generated/PreferencesRow.swift @@ -2,7 +2,7 @@ // PreferencesRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ProgressBar.swift b/Sources/Adwaita/View/Generated/ProgressBar.swift index 4f95abf..105b30d 100644 --- a/Sources/Adwaita/View/Generated/ProgressBar.swift +++ b/Sources/Adwaita/View/Generated/ProgressBar.swift @@ -2,7 +2,7 @@ // ProgressBar.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ScrolledWindow.swift b/Sources/Adwaita/View/Generated/ScrolledWindow.swift index aaa6e7c..4c9e1aa 100644 --- a/Sources/Adwaita/View/Generated/ScrolledWindow.swift +++ b/Sources/Adwaita/View/Generated/ScrolledWindow.swift @@ -2,7 +2,7 @@ // ScrolledWindow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SearchBar.swift b/Sources/Adwaita/View/Generated/SearchBar.swift index 97e2281..cc25656 100644 --- a/Sources/Adwaita/View/Generated/SearchBar.swift +++ b/Sources/Adwaita/View/Generated/SearchBar.swift @@ -2,7 +2,7 @@ // SearchBar.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SearchEntry.swift b/Sources/Adwaita/View/Generated/SearchEntry.swift index d5a0126..b865f90 100644 --- a/Sources/Adwaita/View/Generated/SearchEntry.swift +++ b/Sources/Adwaita/View/Generated/SearchEntry.swift @@ -2,7 +2,7 @@ // SearchEntry.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SpinRow.swift b/Sources/Adwaita/View/Generated/SpinRow.swift index 51cf026..2889995 100644 --- a/Sources/Adwaita/View/Generated/SpinRow.swift +++ b/Sources/Adwaita/View/Generated/SpinRow.swift @@ -2,7 +2,7 @@ // SpinRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Spinner.swift b/Sources/Adwaita/View/Generated/Spinner.swift index 488fb34..12a9451 100644 --- a/Sources/Adwaita/View/Generated/Spinner.swift +++ b/Sources/Adwaita/View/Generated/Spinner.swift @@ -2,7 +2,7 @@ // Spinner.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SplitButton.swift b/Sources/Adwaita/View/Generated/SplitButton.swift index 1be2754..cd3d838 100644 --- a/Sources/Adwaita/View/Generated/SplitButton.swift +++ b/Sources/Adwaita/View/Generated/SplitButton.swift @@ -2,7 +2,7 @@ // SplitButton.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/StatusPage.swift b/Sources/Adwaita/View/Generated/StatusPage.swift index 26f83a2..08373c5 100644 --- a/Sources/Adwaita/View/Generated/StatusPage.swift +++ b/Sources/Adwaita/View/Generated/StatusPage.swift @@ -2,7 +2,7 @@ // StatusPage.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SwitchRow.swift b/Sources/Adwaita/View/Generated/SwitchRow.swift index a16f097..1ad0671 100644 --- a/Sources/Adwaita/View/Generated/SwitchRow.swift +++ b/Sources/Adwaita/View/Generated/SwitchRow.swift @@ -2,7 +2,7 @@ // SwitchRow.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToastOverlay.swift b/Sources/Adwaita/View/Generated/ToastOverlay.swift index 47369ec..1b2237c 100644 --- a/Sources/Adwaita/View/Generated/ToastOverlay.swift +++ b/Sources/Adwaita/View/Generated/ToastOverlay.swift @@ -2,7 +2,7 @@ // ToastOverlay.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToggleButton.swift b/Sources/Adwaita/View/Generated/ToggleButton.swift index b798ee4..024b29f 100644 --- a/Sources/Adwaita/View/Generated/ToggleButton.swift +++ b/Sources/Adwaita/View/Generated/ToggleButton.swift @@ -2,7 +2,7 @@ // ToggleButton.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToolbarView.swift b/Sources/Adwaita/View/Generated/ToolbarView.swift index 51c6f7e..331d8a7 100644 --- a/Sources/Adwaita/View/Generated/ToolbarView.swift +++ b/Sources/Adwaita/View/Generated/ToolbarView.swift @@ -2,7 +2,7 @@ // ToolbarView.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/WindowTitle.swift b/Sources/Adwaita/View/Generated/WindowTitle.swift index 97e0c1b..7bca63b 100644 --- a/Sources/Adwaita/View/Generated/WindowTitle.swift +++ b/Sources/Adwaita/View/Generated/WindowTitle.swift @@ -2,7 +2,7 @@ // WindowTitle.swift // Adwaita // -// Created by auto-generation on 22.05.24. +// Created by auto-generation on 19.07.24. // import CAdw diff --git a/Sources/Generation/GIR/GIRType.swift b/Sources/Generation/GIR/GIRType.swift index 95659b9..64fa8c4 100644 --- a/Sources/Generation/GIR/GIRType.swift +++ b/Sources/Generation/GIR/GIRType.swift @@ -24,6 +24,8 @@ struct GIRType: Decodable { func generate(configuration: GenerationConfiguration) throws -> String { if let cType { return cType.convertCType(configuration: configuration) + } else if let name, let type = configuration.cTypeReplacements[name] { + return type } return "String" } diff --git a/Sources/Generation/GenerationConfiguration.swift b/Sources/Generation/GenerationConfiguration.swift index 95f81b6..6e54322 100644 --- a/Sources/Generation/GenerationConfiguration.swift +++ b/Sources/Generation/GenerationConfiguration.swift @@ -261,7 +261,7 @@ struct GenerationConfiguration { excludeProperties: ["input-hints", "input-purpose"] ), .init(class: "SearchBar"), - .init(class: "Picture", excludeProperties: ["content-fit", "file", "paintable"]) + .init(class: "Picture", excludeProperties: ["file", "paintable"]) ] /// The unshortening map. @@ -284,14 +284,16 @@ struct GenerationConfiguration { "GIcon*": "OpaquePointer", "GdkPixbuf*": "OpaquePointer", "GdkPaintable*": "OpaquePointer", - "NavigationPage": "NavigationPage" + "NavigationPage": "NavigationPage", + "ContentFit": "ContentFit" ] /// Modifications for converting a Swift into a C type. var cTypeProperties = [ "Bool": "cBool", "Int": "cInt", - "UInt": "cInt" + "UInt": "cInt", + "ContentFit": "gtkValue" ] /// Default values for modifiers with a certain type. diff --git a/Tests/PictureDemo.swift b/Tests/PictureDemo.swift index 2da381d..a296063 100644 --- a/Tests/PictureDemo.swift +++ b/Tests/PictureDemo.swift @@ -8,7 +8,6 @@ // swiftlint:disable missing_docs import Adwaita -import CAdw import Foundation struct PictureDemo: View {