From 7ac57d8a5952382825373a03726ddfbfdea10f85 Mon Sep 17 00:00:00 2001 From: david-swift Date: Wed, 22 May 2024 07:19:29 +0200 Subject: [PATCH] Fix ActionRow setting text before markup option --- Sources/Adwaita/View/Generated/ActionRow.swift | 14 +++++++------- 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 +- Sources/Adwaita/View/Generated/ButtonContent.swift | 2 +- Sources/Adwaita/View/Generated/Carousel.swift | 2 +- Sources/Adwaita/View/Generated/CenterBox.swift | 2 +- Sources/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 +- Sources/Adwaita/View/Generated/ExpanderRow.swift | 2 +- Sources/Adwaita/View/Generated/FlowBox.swift | 2 +- Sources/Adwaita/View/Generated/HeaderBar.swift | 2 +- Sources/Adwaita/View/Generated/Label.swift | 2 +- Sources/Adwaita/View/Generated/LevelBar.swift | 2 +- Sources/Adwaita/View/Generated/LinkButton.swift | 2 +- Sources/Adwaita/View/Generated/ListBox.swift | 2 +- Sources/Adwaita/View/Generated/Menu.swift | 2 +- .../Adwaita/View/Generated/NavigationView.swift | 2 +- Sources/Adwaita/View/Generated/Overlay.swift | 2 +- .../Adwaita/View/Generated/OverlaySplitView.swift | 2 +- .../Adwaita/View/Generated/PasswordEntryRow.swift | 2 +- Sources/Adwaita/View/Generated/Picture.swift | 2 +- Sources/Adwaita/View/Generated/Popover.swift | 2 +- .../Adwaita/View/Generated/PreferencesGroup.swift | 2 +- .../Adwaita/View/Generated/PreferencesPage.swift | 2 +- .../Adwaita/View/Generated/PreferencesRow.swift | 2 +- Sources/Adwaita/View/Generated/ProgressBar.swift | 2 +- .../Adwaita/View/Generated/ScrolledWindow.swift | 2 +- Sources/Adwaita/View/Generated/SearchBar.swift | 2 +- Sources/Adwaita/View/Generated/SearchEntry.swift | 2 +- Sources/Adwaita/View/Generated/SpinRow.swift | 2 +- Sources/Adwaita/View/Generated/Spinner.swift | 2 +- Sources/Adwaita/View/Generated/SplitButton.swift | 2 +- Sources/Adwaita/View/Generated/StatusPage.swift | 2 +- Sources/Adwaita/View/Generated/SwitchRow.swift | 2 +- Sources/Adwaita/View/Generated/ToastOverlay.swift | 2 +- Sources/Adwaita/View/Generated/ToggleButton.swift | 2 +- Sources/Adwaita/View/Generated/ToolbarView.swift | 2 +- Sources/Adwaita/View/Generated/WindowTitle.swift | 2 +- Sources/Generation/GIR/Class+.swift | 1 + Sources/Generation/GenerationConfiguration.swift | 3 ++- Sources/Generation/WidgetConfiguration.swift | 2 ++ 46 files changed, 54 insertions(+), 50 deletions(-) diff --git a/Sources/Adwaita/View/Generated/ActionRow.swift b/Sources/Adwaita/View/Generated/ActionRow.swift index 6db8224..95a4000 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw @@ -156,18 +156,12 @@ public struct ActionRow: Widget { if let iconName, updateProperties { adw_action_row_set_icon_name(widget?.cast(), iconName) } - if let subtitle, updateProperties { - adw_action_row_set_subtitle(widget?.cast(), subtitle) - } if let subtitleLines, updateProperties { adw_action_row_set_subtitle_lines(widget?.cast(), subtitleLines.cInt) } if let subtitleSelectable, updateProperties { adw_action_row_set_subtitle_selectable(widget?.cast(), subtitleSelectable.cBool) } - if let title, updateProperties { - adw_preferences_row_set_title(widget?.cast(), title) - } if let titleLines, updateProperties { adw_action_row_set_title_lines(widget?.cast(), titleLines.cInt) } @@ -180,6 +174,12 @@ public struct ActionRow: Widget { if let useUnderline, updateProperties { adw_preferences_row_set_use_underline(widget?.cast(), useUnderline.cBool) } + if let title, updateProperties { + adw_preferences_row_set_title(widget?.cast(), title) + } + if let subtitle, updateProperties { + adw_action_row_set_subtitle(widget?.cast(), subtitle) + } if let suffixStorage = storage.content["suffix"] { for (index, view) in suffix().enumerated() { diff --git a/Sources/Adwaita/View/Generated/Avatar.swift b/Sources/Adwaita/View/Generated/Avatar.swift index bb1cf51..251a840 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Banner.swift b/Sources/Adwaita/View/Generated/Banner.swift index 52af73a..9214661 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Bin.swift b/Sources/Adwaita/View/Generated/Bin.swift index 4f5ee34..b29c7d3 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Box.swift b/Sources/Adwaita/View/Generated/Box.swift index eb2e56e..cc7f640 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Button.swift b/Sources/Adwaita/View/Generated/Button.swift index 65d182b..5b0b6b0 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ButtonContent.swift b/Sources/Adwaita/View/Generated/ButtonContent.swift index d1f9f60..8e2cd18 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Carousel.swift b/Sources/Adwaita/View/Generated/Carousel.swift index 8ecb72d..877a84d 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/CenterBox.swift b/Sources/Adwaita/View/Generated/CenterBox.swift index e8d6206..04d4ee9 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/CheckButton.swift b/Sources/Adwaita/View/Generated/CheckButton.swift index 8a04b26..34f6773 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Clamp.swift b/Sources/Adwaita/View/Generated/Clamp.swift index 91f4e75..b33f4f3 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ComboRow.swift b/Sources/Adwaita/View/Generated/ComboRow.swift index 68fb747..02b07a2 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/EntryRow.swift b/Sources/Adwaita/View/Generated/EntryRow.swift index 4c64c73..c44b6bb 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ExpanderRow.swift b/Sources/Adwaita/View/Generated/ExpanderRow.swift index 968bf62..48dc5c8 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/FlowBox.swift b/Sources/Adwaita/View/Generated/FlowBox.swift index ea3516a..b9ad100 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/HeaderBar.swift b/Sources/Adwaita/View/Generated/HeaderBar.swift index 9612fc6..5ce4174 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Label.swift b/Sources/Adwaita/View/Generated/Label.swift index 37390b4..ab461c0 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/LevelBar.swift b/Sources/Adwaita/View/Generated/LevelBar.swift index 12c9f96..b7595c2 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/LinkButton.swift b/Sources/Adwaita/View/Generated/LinkButton.swift index 7a30c7a..82e3c43 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ListBox.swift b/Sources/Adwaita/View/Generated/ListBox.swift index 873fec0..ee44383 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Menu.swift b/Sources/Adwaita/View/Generated/Menu.swift index 57faf36..77c6359 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/NavigationView.swift b/Sources/Adwaita/View/Generated/NavigationView.swift index f95faff..3d68800 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Overlay.swift b/Sources/Adwaita/View/Generated/Overlay.swift index 4da6bb8..8991678 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/OverlaySplitView.swift b/Sources/Adwaita/View/Generated/OverlaySplitView.swift index d0fd2e3..5a9a757 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift index ab0387a..2ceced9 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Picture.swift b/Sources/Adwaita/View/Generated/Picture.swift index 1157a24..4e0d18b 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Popover.swift b/Sources/Adwaita/View/Generated/Popover.swift index d9227ba..6617fe3 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesGroup.swift b/Sources/Adwaita/View/Generated/PreferencesGroup.swift index d4ddce0..f0df35d 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesPage.swift b/Sources/Adwaita/View/Generated/PreferencesPage.swift index 3e573dc..b6a5fa9 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/PreferencesRow.swift b/Sources/Adwaita/View/Generated/PreferencesRow.swift index cb87e02..cab1b44 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ProgressBar.swift b/Sources/Adwaita/View/Generated/ProgressBar.swift index 28a809d..4f95abf 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ScrolledWindow.swift b/Sources/Adwaita/View/Generated/ScrolledWindow.swift index 7785c2a..aaa6e7c 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SearchBar.swift b/Sources/Adwaita/View/Generated/SearchBar.swift index dfb8d88..97e2281 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SearchEntry.swift b/Sources/Adwaita/View/Generated/SearchEntry.swift index 01433d7..d5a0126 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SpinRow.swift b/Sources/Adwaita/View/Generated/SpinRow.swift index 82d077e..51cf026 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/Spinner.swift b/Sources/Adwaita/View/Generated/Spinner.swift index 0f76428..488fb34 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SplitButton.swift b/Sources/Adwaita/View/Generated/SplitButton.swift index 885e372..1be2754 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/StatusPage.swift b/Sources/Adwaita/View/Generated/StatusPage.swift index 4387677..26f83a2 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/SwitchRow.swift b/Sources/Adwaita/View/Generated/SwitchRow.swift index 168d1c3..a16f097 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToastOverlay.swift b/Sources/Adwaita/View/Generated/ToastOverlay.swift index 80e7a68..47369ec 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToggleButton.swift b/Sources/Adwaita/View/Generated/ToggleButton.swift index 3e0b43a..b798ee4 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/ToolbarView.swift b/Sources/Adwaita/View/Generated/ToolbarView.swift index ac01c74..51c6f7e 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Adwaita/View/Generated/WindowTitle.swift b/Sources/Adwaita/View/Generated/WindowTitle.swift index bb05f51..97e0c1b 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 09.05.24. +// Created by auto-generation on 22.05.24. // import CAdw diff --git a/Sources/Generation/GIR/Class+.swift b/Sources/Generation/GIR/Class+.swift index bad793e..7b7c5d2 100644 --- a/Sources/Generation/GIR/Class+.swift +++ b/Sources/Generation/GIR/Class+.swift @@ -186,6 +186,7 @@ extension Class { ) -> String { var content = "" for property in properties(namespace: namespace, configurations: configs) + .sorted(by: { config.lastProperties.contains($1.name) }) where !config.excludeProperties.contains(property.name) { content += property.generateModification(config: config, genConfig: genConfig, prefix: prefix()) } diff --git a/Sources/Generation/GenerationConfiguration.swift b/Sources/Generation/GenerationConfiguration.swift index 3c0e653..95f81b6 100644 --- a/Sources/Generation/GenerationConfiguration.swift +++ b/Sources/Generation/GenerationConfiguration.swift @@ -71,7 +71,8 @@ struct GenerationConfiguration { .init(name: "suffix", add: "adw_action_row_add_suffix"), .init(name: "prefix", add: "adw_action_row_add_prefix") ], - cast: true + cast: true, + lastProperties: ["title", "subtitle"] ), .init(class: "SwitchRow", bindings: [.init(property: "active")]), .init( diff --git a/Sources/Generation/WidgetConfiguration.swift b/Sources/Generation/WidgetConfiguration.swift index 95b05f4..f775116 100644 --- a/Sources/Generation/WidgetConfiguration.swift +++ b/Sources/Generation/WidgetConfiguration.swift @@ -32,6 +32,8 @@ struct WidgetConfiguration { var cast = false /// Conditions for when to update a property. var setConditions: [String: String] = [:] + /// Properties that are set in the end of an update. + var lastProperties: [String] = [] /// The configuration for a binding. struct BindingConfiguration {