From e44f3d78d24320b045a7fc76db26b8d09e025a01 Mon Sep 17 00:00:00 2001 From: david-swift Date: Thu, 9 May 2024 08:21:04 +0200 Subject: [PATCH] Fix ComboRow not selecting value at initialization Fixes #28 --- Sources/Adwaita/View/Forms/ComboRow+.swift | 39 ++++++++++++------- .../Adwaita/View/Generated/ActionRow.swift | 8 ++-- Sources/Adwaita/View/Generated/Avatar.swift | 6 +-- Sources/Adwaita/View/Generated/Banner.swift | 6 +-- Sources/Adwaita/View/Generated/Bin.swift | 8 ++-- Sources/Adwaita/View/Generated/Box.swift | 8 ++-- Sources/Adwaita/View/Generated/Button.swift | 8 ++-- .../View/Generated/ButtonContent.swift | 6 +-- Sources/Adwaita/View/Generated/Carousel.swift | 6 +-- .../Adwaita/View/Generated/CenterBox.swift | 8 ++-- .../Adwaita/View/Generated/CheckButton.swift | 8 ++-- Sources/Adwaita/View/Generated/Clamp.swift | 8 ++-- Sources/Adwaita/View/Generated/ComboRow.swift | 8 ++-- Sources/Adwaita/View/Generated/EntryRow.swift | 8 ++-- .../Adwaita/View/Generated/ExpanderRow.swift | 8 ++-- Sources/Adwaita/View/Generated/FlowBox.swift | 6 +-- .../Adwaita/View/Generated/HeaderBar.swift | 8 ++-- Sources/Adwaita/View/Generated/Label.swift | 8 ++-- Sources/Adwaita/View/Generated/LevelBar.swift | 6 +-- .../Adwaita/View/Generated/LinkButton.swift | 8 ++-- Sources/Adwaita/View/Generated/ListBox.swift | 6 +-- Sources/Adwaita/View/Generated/Menu.swift | 8 ++-- .../View/Generated/NavigationView.swift | 6 +-- Sources/Adwaita/View/Generated/Overlay.swift | 8 ++-- .../View/Generated/OverlaySplitView.swift | 8 ++-- .../View/Generated/PasswordEntryRow.swift | 8 ++-- Sources/Adwaita/View/Generated/Picture.swift | 6 +-- Sources/Adwaita/View/Generated/Popover.swift | 8 ++-- .../View/Generated/PreferencesGroup.swift | 8 ++-- .../View/Generated/PreferencesPage.swift | 8 ++-- .../View/Generated/PreferencesRow.swift | 6 +-- .../Adwaita/View/Generated/ProgressBar.swift | 6 +-- .../View/Generated/ScrolledWindow.swift | 8 ++-- .../Adwaita/View/Generated/SearchBar.swift | 8 ++-- .../Adwaita/View/Generated/SearchEntry.swift | 6 +-- Sources/Adwaita/View/Generated/SpinRow.swift | 8 ++-- Sources/Adwaita/View/Generated/Spinner.swift | 6 +-- .../Adwaita/View/Generated/SplitButton.swift | 8 ++-- .../Adwaita/View/Generated/StatusPage.swift | 8 ++-- .../Adwaita/View/Generated/SwitchRow.swift | 8 ++-- .../Adwaita/View/Generated/ToastOverlay.swift | 8 ++-- .../Adwaita/View/Generated/ToggleButton.swift | 8 ++-- .../Adwaita/View/Generated/ToolbarView.swift | 8 ++-- .../Adwaita/View/Generated/WindowTitle.swift | 6 +-- Sources/Generation/GIR/Class.swift | 4 +- Tests/FormDemo.swift | 2 +- 46 files changed, 185 insertions(+), 176 deletions(-) diff --git a/Sources/Adwaita/View/Forms/ComboRow+.swift b/Sources/Adwaita/View/Forms/ComboRow+.swift index e5e814f..e6ced30 100644 --- a/Sources/Adwaita/View/Forms/ComboRow+.swift +++ b/Sources/Adwaita/View/Forms/ComboRow+.swift @@ -36,23 +36,32 @@ extension ComboRow { let list = gtk_string_list_new(nil) storage.fields[Self.stringList] = list adw_combo_row_set_model(storage.pointer?.cast(), list) + Self.updateContent(storage: storage, values: values, element: Element.self) } updateFunctions.append { storage, _, _ in - if let list = storage.fields[Self.stringList] as? OpaquePointer { - let old = storage.fields[Self.values] as? [Element] ?? [] - old.identifiableTransform( - to: values, - functions: .init { index, element in - gtk_string_list_remove(list, .init(index)) - gtk_string_list_append(list, element.description) - } delete: { index in - gtk_string_list_remove(list, .init(index)) - } insert: { _, element in - gtk_string_list_append(list, element.description) - } - ) - storage.fields[Self.values] = values - } + Self.updateContent(storage: storage, values: values, element: Element.self) + } + } + + static func updateContent( + storage: ViewStorage, + values: [Element], + element: Element.Type + ) where Element: Identifiable, Element: CustomStringConvertible { + if let list = storage.fields[Self.stringList] as? OpaquePointer { + let old = storage.fields[Self.values] as? [Element] ?? [] + old.identifiableTransform( + to: values, + functions: .init { index, element in + gtk_string_list_remove(list, .init(index)) + gtk_string_list_append(list, element.description) + } delete: { index in + gtk_string_list_remove(list, .init(index)) + } insert: { _, element in + gtk_string_list_append(list, element.description) + } + ) + storage.fields[Self.values] = values } } diff --git a/Sources/Adwaita/View/Generated/ActionRow.swift b/Sources/Adwaita/View/Generated/ActionRow.swift index e1eb605..6db8224 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -113,6 +113,9 @@ public struct ActionRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_action_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let activatableWidgetStorage = activatableWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["activatableWidget"] = [activatableWidgetStorage] @@ -131,9 +134,6 @@ public struct ActionRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Avatar.swift b/Sources/Adwaita/View/Generated/Avatar.swift index 6193453..bb1cf51 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -66,11 +66,11 @@ public struct Avatar: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_avatar_new(size.cInt, text, showInitials.cBool)?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Banner.swift b/Sources/Adwaita/View/Generated/Banner.swift index ba5d7bd..52af73a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -70,11 +70,11 @@ public struct Banner: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_banner_new(title)?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Bin.swift b/Sources/Adwaita/View/Generated/Bin.swift index be41bc8..4f5ee34 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -40,15 +40,15 @@ public struct Bin: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_bin_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] adw_bin_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Box.swift b/Sources/Adwaita/View/Generated/Box.swift index eda19a1..eb2e56e 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -78,6 +78,9 @@ public struct Box: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing.cInt)?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) var appendStorage: [ViewStorage] = [] @@ -92,9 +95,6 @@ public struct Box: Widget { gtk_box_prepend(storage.pointer?.cast(), prependStorage.last?.pointer?.cast()) } storage.content["prepend"] = prependStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Button.swift b/Sources/Adwaita/View/Generated/Button.swift index a17f412..65d182b 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -94,15 +94,15 @@ public struct Button: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_button_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ButtonContent.swift b/Sources/Adwaita/View/Generated/ButtonContent.swift index 7242da5..d1f9f60 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -83,11 +83,11 @@ public struct ButtonContent: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_button_content_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Carousel.swift b/Sources/Adwaita/View/Generated/Carousel.swift index 9a850cc..8ecb72d 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -81,11 +81,11 @@ public struct Carousel: Widget where Element: Identifiable { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_carousel_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/CenterBox.swift b/Sources/Adwaita/View/Generated/CenterBox.swift index c1a1483..e8d6206 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -90,6 +90,9 @@ public struct CenterBox: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_center_box_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let centerWidgetStorage = centerWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["centerWidget"] = [centerWidgetStorage] @@ -104,9 +107,6 @@ public struct CenterBox: Widget { gtk_center_box_set_start_widget(storage.pointer, startWidgetStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/CheckButton.swift b/Sources/Adwaita/View/Generated/CheckButton.swift index 766a271..8a04b26 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -123,15 +123,15 @@ public struct CheckButton: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_check_button_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] gtk_check_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Clamp.swift b/Sources/Adwaita/View/Generated/Clamp.swift index 799491a..91f4e75 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -68,15 +68,15 @@ public struct Clamp: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_clamp_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] adw_clamp_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ComboRow.swift b/Sources/Adwaita/View/Generated/ComboRow.swift index 02a7aee..68fb747 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -137,6 +137,9 @@ public struct ComboRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_combo_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let activatableWidgetStorage = activatableWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["activatableWidget"] = [activatableWidgetStorage] @@ -155,9 +158,6 @@ public struct ComboRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/EntryRow.swift b/Sources/Adwaita/View/Generated/EntryRow.swift index 99db22a..4c64c73 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -105,6 +105,9 @@ public struct EntryRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_entry_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) var suffixStorage: [ViewStorage] = [] @@ -119,9 +122,6 @@ public struct EntryRow: Widget { adw_entry_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ExpanderRow.swift b/Sources/Adwaita/View/Generated/ExpanderRow.swift index 6a8eb30..968bf62 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -99,6 +99,9 @@ public struct ExpanderRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_expander_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) var rowsStorage: [ViewStorage] = [] @@ -119,9 +122,6 @@ public struct ExpanderRow: Widget { adw_expander_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/FlowBox.swift b/Sources/Adwaita/View/Generated/FlowBox.swift index dd41a21..ea3516a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -154,11 +154,11 @@ public struct FlowBox: Widget where Element: Identifiable { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_flow_box_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/HeaderBar.swift b/Sources/Adwaita/View/Generated/HeaderBar.swift index 8d68345..9612fc6 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -166,6 +166,9 @@ public struct HeaderBar: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_header_bar_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let titleWidgetStorage = titleWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["titleWidget"] = [titleWidgetStorage] @@ -184,9 +187,6 @@ public struct HeaderBar: Widget { adw_header_bar_pack_end(storage.pointer, endStorage.last?.pointer?.cast()) } storage.content["end"] = endStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Label.swift b/Sources/Adwaita/View/Generated/Label.swift index acf5c5a..37390b4 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -283,15 +283,15 @@ public struct Label: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_label_new(label)?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let mnemonicWidgetStorage = mnemonicWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["mnemonicWidget"] = [mnemonicWidgetStorage] gtk_label_set_mnemonic_widget(storage.pointer, mnemonicWidgetStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/LevelBar.swift b/Sources/Adwaita/View/Generated/LevelBar.swift index 9e2d3c2..12c9f96 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -150,11 +150,11 @@ public struct LevelBar: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_level_bar_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/LinkButton.swift b/Sources/Adwaita/View/Generated/LinkButton.swift index e9d5b61..7a30c7a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -97,15 +97,15 @@ public struct LinkButton: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_link_button_new(uri)?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ListBox.swift b/Sources/Adwaita/View/Generated/ListBox.swift index 00549ec..873fec0 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -131,11 +131,11 @@ public struct ListBox: Widget where Element: Identifiable { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_list_box_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Menu.swift b/Sources/Adwaita/View/Generated/Menu.swift index 7f1a25a..57faf36 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -125,6 +125,9 @@ public struct Menu: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_menu_button_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] @@ -138,9 +141,6 @@ public struct Menu: Widget { } } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/NavigationView.swift b/Sources/Adwaita/View/Generated/NavigationView.swift index 3cb93c0..f95faff 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -176,11 +176,11 @@ public struct NavigationView: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_navigation_view_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Overlay.swift b/Sources/Adwaita/View/Generated/Overlay.swift index e58f943..4da6bb8 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -84,6 +84,9 @@ public struct Overlay: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_overlay_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] @@ -96,9 +99,6 @@ public struct Overlay: Widget { gtk_overlay_add_overlay(storage.pointer, overlayStorage.last?.pointer?.cast()) } storage.content["overlay"] = overlayStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/OverlaySplitView.swift b/Sources/Adwaita/View/Generated/OverlaySplitView.swift index 47e4f27..d0fd2e3 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -184,6 +184,9 @@ public struct OverlaySplitView: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_overlay_split_view_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let contentStorage = content?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["content"] = [contentStorage] @@ -194,9 +197,6 @@ public struct OverlaySplitView: Widget { adw_overlay_split_view_set_sidebar(storage.pointer, sidebarStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift index 3f169fc..ab0387a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -90,6 +90,9 @@ public struct PasswordEntryRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_password_entry_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) var suffixStorage: [ViewStorage] = [] @@ -104,9 +107,6 @@ public struct PasswordEntryRow: Widget { adw_entry_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Picture.swift b/Sources/Adwaita/View/Generated/Picture.swift index 59f138f..1157a24 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -86,11 +86,11 @@ public struct Picture: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_picture_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/Popover.swift b/Sources/Adwaita/View/Generated/Popover.swift index 0699148..d9227ba 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -113,6 +113,9 @@ public struct Popover: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_popover_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] @@ -123,9 +126,6 @@ public struct Popover: Widget { gtk_popover_set_default_widget(storage.pointer?.cast(), defaultWidgetStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/PreferencesGroup.swift b/Sources/Adwaita/View/Generated/PreferencesGroup.swift index 4e32ddf..d4ddce0 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -70,6 +70,9 @@ public struct PreferencesGroup: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_preferences_group_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let headerSuffixStorage = headerSuffix?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["headerSuffix"] = [headerSuffixStorage] @@ -82,9 +85,6 @@ public struct PreferencesGroup: Widget { adw_preferences_group_add(storage.pointer?.cast(), childStorage.last?.pointer?.cast()) } storage.content["child"] = childStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/PreferencesPage.swift b/Sources/Adwaita/View/Generated/PreferencesPage.swift index d305882..3e573dc 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -55,6 +55,9 @@ public struct PreferencesPage: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_preferences_page_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) var childStorage: [ViewStorage] = [] @@ -63,9 +66,6 @@ public struct PreferencesPage: Widget { adw_preferences_group_add(storage.pointer?.cast(), childStorage.last?.pointer?.cast()) } storage.content["child"] = childStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/PreferencesRow.swift b/Sources/Adwaita/View/Generated/PreferencesRow.swift index 3c59c67..cb87e02 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -55,11 +55,11 @@ public struct PreferencesRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_preferences_row_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/ProgressBar.swift b/Sources/Adwaita/View/Generated/ProgressBar.swift index 492cbf9..28a809d 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -98,11 +98,11 @@ public struct ProgressBar: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_progress_bar_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/ScrolledWindow.swift b/Sources/Adwaita/View/Generated/ScrolledWindow.swift index 65b72cf..7785c2a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -178,15 +178,15 @@ public struct ScrolledWindow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_scrolled_window_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] gtk_scrolled_window_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/SearchBar.swift b/Sources/Adwaita/View/Generated/SearchBar.swift index f13344e..dfb8d88 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -85,6 +85,9 @@ public struct SearchBar: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_search_bar_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] @@ -95,9 +98,6 @@ public struct SearchBar: Widget { gtk_search_bar_set_key_capture_widget(storage.pointer, keyCaptureWidgetStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/SearchEntry.swift b/Sources/Adwaita/View/Generated/SearchEntry.swift index e81aaaa..01433d7 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -168,11 +168,11 @@ public struct SearchEntry: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_search_entry_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/SpinRow.swift b/Sources/Adwaita/View/Generated/SpinRow.swift index 46479f9..82d077e 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -129,6 +129,9 @@ public struct SpinRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_spin_row_new(nil, climbRate, digits.cInt)?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let activatableWidgetStorage = activatableWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["activatableWidget"] = [activatableWidgetStorage] @@ -147,9 +150,6 @@ public struct SpinRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/Spinner.swift b/Sources/Adwaita/View/Generated/Spinner.swift index ffcdda1..0f76428 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -50,11 +50,11 @@ public struct Spinner: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_spinner_new()?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Adwaita/View/Generated/SplitButton.swift b/Sources/Adwaita/View/Generated/SplitButton.swift index bd7d0fb..885e372 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -109,6 +109,9 @@ public struct SplitButton: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_split_button_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] @@ -122,9 +125,6 @@ public struct SplitButton: Widget { } } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/StatusPage.swift b/Sources/Adwaita/View/Generated/StatusPage.swift index 9963d2e..4387677 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -55,15 +55,15 @@ public struct StatusPage: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_status_page_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] adw_status_page_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/SwitchRow.swift b/Sources/Adwaita/View/Generated/SwitchRow.swift index b6adbfa..168d1c3 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -104,6 +104,9 @@ public struct SwitchRow: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_switch_row_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let activatableWidgetStorage = activatableWidget?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["activatableWidget"] = [activatableWidgetStorage] @@ -122,9 +125,6 @@ public struct SwitchRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ToastOverlay.swift b/Sources/Adwaita/View/Generated/ToastOverlay.swift index 6b9997f..80e7a68 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -67,15 +67,15 @@ public struct ToastOverlay: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_toast_overlay_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] adw_toast_overlay_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ToggleButton.swift b/Sources/Adwaita/View/Generated/ToggleButton.swift index 7729572..3e0b43a 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -143,15 +143,15 @@ public struct ToggleButton: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(gtk_toggle_button_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let childStorage = child?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["child"] = [childStorage] gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/ToolbarView.swift b/Sources/Adwaita/View/Generated/ToolbarView.swift index 25fd3fe..ac01c74 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -152,6 +152,9 @@ public struct ToolbarView: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_toolbar_view_new()?.opaque()) + for function in appearFunctions { + function(storage, modifiers) + } update(storage, modifiers: modifiers, updateProperties: true) if let contentStorage = content?().widget(modifiers: modifiers).storage(modifiers: modifiers) { storage.content["content"] = [contentStorage] @@ -170,9 +173,6 @@ public struct ToolbarView: Widget { adw_toolbar_view_add_top_bar(storage.pointer, topStorage.last?.pointer?.cast()) } storage.content["top"] = topStorage - for function in appearFunctions { - function(storage, modifiers) - } return storage } diff --git a/Sources/Adwaita/View/Generated/WindowTitle.swift b/Sources/Adwaita/View/Generated/WindowTitle.swift index aa73ee0..bb05f51 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 21.04.24. +// Created by auto-generation on 09.05.24. // import CAdw @@ -50,11 +50,11 @@ public struct WindowTitle: Widget { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(adw_window_title_new(title, subtitle)?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + return storage } diff --git a/Sources/Generation/GIR/Class.swift b/Sources/Generation/GIR/Class.swift index b9b03b6..3bc8f85 100644 --- a/Sources/Generation/GIR/Class.swift +++ b/Sources/Generation/GIR/Class.swift @@ -97,11 +97,11 @@ struct Class: ClassLike, Decodable { /// - Returns: The view storage. public func container(modifiers: [(View) -> View]) -> ViewStorage { let storage = ViewStorage(\(generateInitializer(name: widgetName, config: config, namespace: namespace, configs: configs))?.opaque()) - update(storage, modifiers: modifiers, updateProperties: true) - \(generateWidgetAssignments(config: config, genConfig: genConfig, namespace: namespace, configs: configs)) for function in appearFunctions { function(storage, modifiers) } + update(storage, modifiers: modifiers, updateProperties: true) + \(generateWidgetAssignments(config: config, genConfig: genConfig, namespace: namespace, configs: configs)) return storage } diff --git a/Tests/FormDemo.swift b/Tests/FormDemo.swift index ca2cac4..f0147ac 100644 --- a/Tests/FormDemo.swift +++ b/Tests/FormDemo.swift @@ -30,7 +30,7 @@ struct FormDemo: View { @State private var password = "Password" @State private var value = 0 @State private var isOn = true - @State private var selection = "Hello" + @State private var selection = "World" let values: [ListDemo.Element] = [.init(id: "Hello"), .init(id: "World")]