From ffdb727a00c400a3d6051ca8cdf53a62fb7507f8 Mon Sep 17 00:00:00 2001 From: david-swift Date: Wed, 14 Feb 2024 16:45:53 +0100 Subject: [PATCH] Update bindings whenever the view updates --- .../Adwaita/View/Generated/ActionRow.swift | 2 +- 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 | 14 +++++----- Sources/Adwaita/View/Generated/Clamp.swift | 2 +- Sources/Adwaita/View/Generated/ComboRow.swift | 14 +++++----- Sources/Adwaita/View/Generated/EntryRow.swift | 2 +- .../Adwaita/View/Generated/ExpanderRow.swift | 26 +++++++++---------- Sources/Adwaita/View/Generated/FlowBox.swift | 2 +- .../Adwaita/View/Generated/HeaderBar.swift | 2 +- 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 | 14 +++++----- Sources/Adwaita/View/Generated/Overlay.swift | 2 +- .../View/Generated/OverlaySplitView.swift | 14 +++++----- .../View/Generated/PasswordEntryRow.swift | 2 +- 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 | 14 +++++----- Sources/Adwaita/View/Generated/SpinRow.swift | 14 +++++----- Sources/Adwaita/View/Generated/Spinner.swift | 2 +- .../Adwaita/View/Generated/SplitButton.swift | 2 +- .../Adwaita/View/Generated/StatusPage.swift | 2 +- .../Adwaita/View/Generated/SwitchRow.swift | 14 +++++----- .../Adwaita/View/Generated/ToastOverlay.swift | 2 +- .../Adwaita/View/Generated/ToggleButton.swift | 14 +++++----- .../Adwaita/View/Generated/ToolbarView.swift | 2 +- .../Adwaita/View/Generated/WindowTitle.swift | 2 +- Sources/Generation/GIR/Class.swift | 2 +- 42 files changed, 102 insertions(+), 102 deletions(-) diff --git a/Sources/Adwaita/View/Generated/ActionRow.swift b/Sources/Adwaita/View/Generated/ActionRow.swift index 217319a..8137e7c 100644 --- a/Sources/Adwaita/View/Generated/ActionRow.swift +++ b/Sources/Adwaita/View/Generated/ActionRow.swift @@ -131,7 +131,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) } @@ -150,6 +149,7 @@ public struct ActionRow: Widget { } } storage.modify { widget in + if let widget = storage.content["activatableWidget"]?.first { activatableWidget?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/Avatar.swift b/Sources/Adwaita/View/Generated/Avatar.swift index 66b6463..2a9490a 100644 --- a/Sources/Adwaita/View/Generated/Avatar.swift +++ b/Sources/Adwaita/View/Generated/Avatar.swift @@ -68,7 +68,6 @@ public struct Avatar: Widget { let storage = ViewStorage(adw_avatar_new(size.cInt, text, showInitials.cBool)?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -82,6 +81,7 @@ public struct Avatar: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let iconName, updateProperties { adw_avatar_set_icon_name(widget, iconName) } diff --git a/Sources/Adwaita/View/Generated/Banner.swift b/Sources/Adwaita/View/Generated/Banner.swift index e9dc1e3..896bfa8 100644 --- a/Sources/Adwaita/View/Generated/Banner.swift +++ b/Sources/Adwaita/View/Generated/Banner.swift @@ -72,7 +72,6 @@ public struct Banner: Widget { let storage = ViewStorage(adw_banner_new(title)?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -91,6 +90,7 @@ public struct Banner: Widget { } } storage.modify { widget in + if let buttonLabel, updateProperties { adw_banner_set_button_label(widget, buttonLabel) } diff --git a/Sources/Adwaita/View/Generated/Bin.swift b/Sources/Adwaita/View/Generated/Bin.swift index aaf25c4..f45f07a 100644 --- a/Sources/Adwaita/View/Generated/Bin.swift +++ b/Sources/Adwaita/View/Generated/Bin.swift @@ -46,7 +46,6 @@ public struct Bin: Widget { adw_bin_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -60,6 +59,7 @@ public struct Bin: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/Box.swift b/Sources/Adwaita/View/Generated/Box.swift index d76387f..df7e7b0 100644 --- a/Sources/Adwaita/View/Generated/Box.swift +++ b/Sources/Adwaita/View/Generated/Box.swift @@ -92,7 +92,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) } @@ -106,6 +105,7 @@ public struct Box: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let baselineChild, updateProperties { gtk_box_set_baseline_child(widget?.cast(), baselineChild.cInt) } diff --git a/Sources/Adwaita/View/Generated/Button.swift b/Sources/Adwaita/View/Generated/Button.swift index 5b2da78..17bc719 100644 --- a/Sources/Adwaita/View/Generated/Button.swift +++ b/Sources/Adwaita/View/Generated/Button.swift @@ -100,7 +100,6 @@ public struct Button: Widget { gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -124,6 +123,7 @@ public struct Button: Widget { } } storage.modify { widget in + if let actionName, updateProperties { gtk_actionable_set_action_name(widget, actionName) } diff --git a/Sources/Adwaita/View/Generated/ButtonContent.swift b/Sources/Adwaita/View/Generated/ButtonContent.swift index 6f08105..0172f68 100644 --- a/Sources/Adwaita/View/Generated/ButtonContent.swift +++ b/Sources/Adwaita/View/Generated/ButtonContent.swift @@ -84,7 +84,6 @@ public struct ButtonContent: Widget { let storage = ViewStorage(adw_button_content_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -98,6 +97,7 @@ public struct ButtonContent: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let canShrink, updateProperties { adw_button_content_set_can_shrink(widget, canShrink.cBool) } diff --git a/Sources/Adwaita/View/Generated/Carousel.swift b/Sources/Adwaita/View/Generated/Carousel.swift index fc1f02b..158806f 100644 --- a/Sources/Adwaita/View/Generated/Carousel.swift +++ b/Sources/Adwaita/View/Generated/Carousel.swift @@ -81,7 +81,6 @@ public struct Carousel: Widget where Element: Identifiable { let storage = ViewStorage(adw_carousel_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -100,6 +99,7 @@ public struct Carousel: Widget where Element: Identifiable { } } storage.modify { widget in + if let allowLongSwipes, updateProperties { adw_carousel_set_allow_long_swipes(widget, allowLongSwipes.cBool) } diff --git a/Sources/Adwaita/View/Generated/CenterBox.swift b/Sources/Adwaita/View/Generated/CenterBox.swift index de16067..f69dd1a 100644 --- a/Sources/Adwaita/View/Generated/CenterBox.swift +++ b/Sources/Adwaita/View/Generated/CenterBox.swift @@ -104,7 +104,6 @@ public struct CenterBox: Widget { gtk_center_box_set_start_widget(storage.pointer, startWidgetStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -118,6 +117,7 @@ public struct CenterBox: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["centerWidget"]?.first { centerWidget?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/CheckButton.swift b/Sources/Adwaita/View/Generated/CheckButton.swift index c09c214..904488f 100644 --- a/Sources/Adwaita/View/Generated/CheckButton.swift +++ b/Sources/Adwaita/View/Generated/CheckButton.swift @@ -129,13 +129,6 @@ public struct CheckButton: Widget { gtk_check_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - - storage.notify(name: "active") { - let newValue = gtk_check_button_get_active(storage.pointer?.cast()) != 0 -if let active, newValue != active.wrappedValue { - active.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -159,6 +152,13 @@ if let active, newValue != active.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "active") { + let newValue = gtk_check_button_get_active(storage.pointer?.cast()) != 0 +if let active, newValue != active.wrappedValue { + active.wrappedValue = newValue +} + } if let actionName, updateProperties { gtk_actionable_set_action_name(widget, actionName) } diff --git a/Sources/Adwaita/View/Generated/Clamp.swift b/Sources/Adwaita/View/Generated/Clamp.swift index cda53ff..04aa76a 100644 --- a/Sources/Adwaita/View/Generated/Clamp.swift +++ b/Sources/Adwaita/View/Generated/Clamp.swift @@ -74,7 +74,6 @@ public struct Clamp: Widget { adw_clamp_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -88,6 +87,7 @@ public struct Clamp: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/ComboRow.swift b/Sources/Adwaita/View/Generated/ComboRow.swift index 9806fbb..cbe678d 100644 --- a/Sources/Adwaita/View/Generated/ComboRow.swift +++ b/Sources/Adwaita/View/Generated/ComboRow.swift @@ -155,13 +155,6 @@ public struct ComboRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - - storage.notify(name: "selected") { - let newValue = UInt(adw_combo_row_get_selected(storage.pointer?.cast())) -if let selected, newValue != selected.wrappedValue { - selected.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -180,6 +173,13 @@ if let selected, newValue != selected.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "selected") { + let newValue = UInt(adw_combo_row_get_selected(storage.pointer?.cast())) +if let selected, newValue != selected.wrappedValue { + selected.wrappedValue = newValue +} + } if let widget = storage.content["activatableWidget"]?.first { activatableWidget?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/EntryRow.swift b/Sources/Adwaita/View/Generated/EntryRow.swift index 563d21d..7dbb700 100644 --- a/Sources/Adwaita/View/Generated/EntryRow.swift +++ b/Sources/Adwaita/View/Generated/EntryRow.swift @@ -117,7 +117,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) } @@ -141,6 +140,7 @@ public struct EntryRow: Widget { } } storage.modify { widget in + if let activatesDefault, updateProperties { adw_entry_row_set_activates_default(widget?.cast(), activatesDefault.cBool) } diff --git a/Sources/Adwaita/View/Generated/ExpanderRow.swift b/Sources/Adwaita/View/Generated/ExpanderRow.swift index 69c13d2..7f84509 100644 --- a/Sources/Adwaita/View/Generated/ExpanderRow.swift +++ b/Sources/Adwaita/View/Generated/ExpanderRow.swift @@ -119,19 +119,6 @@ public struct ExpanderRow: Widget { adw_expander_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - - storage.notify(name: "enable-expansion") { - let newValue = adw_expander_row_get_enable_expansion(storage.pointer?.cast()) != 0 -if let enableExpansion, newValue != enableExpansion.wrappedValue { - enableExpansion.wrappedValue = newValue -} - } - storage.notify(name: "expanded") { - let newValue = adw_expander_row_get_expanded(storage.pointer?.cast()) != 0 -if let expanded, newValue != expanded.wrappedValue { - expanded.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -145,6 +132,19 @@ if let expanded, newValue != expanded.wrappedValue { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + + storage.notify(name: "enable-expansion") { + let newValue = adw_expander_row_get_enable_expansion(storage.pointer?.cast()) != 0 +if let enableExpansion, newValue != enableExpansion.wrappedValue { + enableExpansion.wrappedValue = newValue +} + } + storage.notify(name: "expanded") { + let newValue = adw_expander_row_get_expanded(storage.pointer?.cast()) != 0 +if let expanded, newValue != expanded.wrappedValue { + expanded.wrappedValue = newValue +} + } if let enableExpansion, updateProperties, (adw_expander_row_get_enable_expansion(storage.pointer?.cast()) != 0) != enableExpansion.wrappedValue { adw_expander_row_set_enable_expansion(storage.pointer?.cast(), enableExpansion.wrappedValue.cBool) } diff --git a/Sources/Adwaita/View/Generated/FlowBox.swift b/Sources/Adwaita/View/Generated/FlowBox.swift index 8ea3666..9eb175c 100644 --- a/Sources/Adwaita/View/Generated/FlowBox.swift +++ b/Sources/Adwaita/View/Generated/FlowBox.swift @@ -156,7 +156,6 @@ public struct FlowBox: Widget where Element: Identifiable { let storage = ViewStorage(gtk_flow_box_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -205,6 +204,7 @@ public struct FlowBox: Widget where Element: Identifiable { } } storage.modify { widget in + if let activateOnSingleClick, updateProperties { gtk_flow_box_set_activate_on_single_click(widget, activateOnSingleClick.cBool) } diff --git a/Sources/Adwaita/View/Generated/HeaderBar.swift b/Sources/Adwaita/View/Generated/HeaderBar.swift index 06e6065..57f2e08 100644 --- a/Sources/Adwaita/View/Generated/HeaderBar.swift +++ b/Sources/Adwaita/View/Generated/HeaderBar.swift @@ -174,7 +174,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) } @@ -188,6 +187,7 @@ public struct HeaderBar: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let decorationLayout, updateProperties { adw_header_bar_set_decoration_layout(widget, decorationLayout) } diff --git a/Sources/Adwaita/View/Generated/Label.swift b/Sources/Adwaita/View/Generated/Label.swift index b97794c..05a4af1 100644 --- a/Sources/Adwaita/View/Generated/Label.swift +++ b/Sources/Adwaita/View/Generated/Label.swift @@ -287,7 +287,6 @@ public struct Label: Widget { gtk_label_set_mnemonic_widget(storage.pointer, mnemonicWidgetStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -306,6 +305,7 @@ public struct Label: Widget { } } storage.modify { widget in + if updateProperties { gtk_label_set_label(widget, label) } diff --git a/Sources/Adwaita/View/Generated/LevelBar.swift b/Sources/Adwaita/View/Generated/LevelBar.swift index 972c2f6..6c2348b 100644 --- a/Sources/Adwaita/View/Generated/LevelBar.swift +++ b/Sources/Adwaita/View/Generated/LevelBar.swift @@ -152,7 +152,6 @@ public struct LevelBar: Widget { let storage = ViewStorage(gtk_level_bar_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -171,6 +170,7 @@ public struct LevelBar: Widget { } } storage.modify { widget in + if let inverted, updateProperties { gtk_level_bar_set_inverted(widget, inverted.cBool) } diff --git a/Sources/Adwaita/View/Generated/LinkButton.swift b/Sources/Adwaita/View/Generated/LinkButton.swift index bbaab07..ae5bff4 100644 --- a/Sources/Adwaita/View/Generated/LinkButton.swift +++ b/Sources/Adwaita/View/Generated/LinkButton.swift @@ -103,7 +103,6 @@ public struct LinkButton: Widget { gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -127,6 +126,7 @@ public struct LinkButton: Widget { } } storage.modify { widget in + if let actionName, updateProperties { gtk_actionable_set_action_name(widget, actionName) } diff --git a/Sources/Adwaita/View/Generated/ListBox.swift b/Sources/Adwaita/View/Generated/ListBox.swift index bcd016c..25218f7 100644 --- a/Sources/Adwaita/View/Generated/ListBox.swift +++ b/Sources/Adwaita/View/Generated/ListBox.swift @@ -133,7 +133,6 @@ public struct ListBox: Widget where Element: Identifiable { let storage = ViewStorage(gtk_list_box_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -187,6 +186,7 @@ public struct ListBox: Widget where Element: Identifiable { } } storage.modify { widget in + if let activateOnSingleClick, updateProperties { gtk_list_box_set_activate_on_single_click(widget, activateOnSingleClick.cBool) } diff --git a/Sources/Adwaita/View/Generated/Menu.swift b/Sources/Adwaita/View/Generated/Menu.swift index d7d511f..146ac05 100644 --- a/Sources/Adwaita/View/Generated/Menu.swift +++ b/Sources/Adwaita/View/Generated/Menu.swift @@ -138,13 +138,6 @@ public struct Menu: Widget { } } - - storage.notify(name: "active") { - let newValue = gtk_menu_button_get_active(storage.pointer) != 0 -if let active, newValue != active.wrappedValue { - active.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -163,6 +156,13 @@ if let active, newValue != active.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "active") { + let newValue = gtk_menu_button_get_active(storage.pointer) != 0 +if let active, newValue != active.wrappedValue { + active.wrappedValue = newValue +} + } if let active, updateProperties, (gtk_menu_button_get_active(storage.pointer) != 0) != active.wrappedValue { gtk_menu_button_set_active(storage.pointer, active.wrappedValue.cBool) } diff --git a/Sources/Adwaita/View/Generated/Overlay.swift b/Sources/Adwaita/View/Generated/Overlay.swift index e951bc2..9a6e72a 100644 --- a/Sources/Adwaita/View/Generated/Overlay.swift +++ b/Sources/Adwaita/View/Generated/Overlay.swift @@ -96,7 +96,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) } @@ -115,6 +114,7 @@ public struct Overlay: Widget { } } storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/OverlaySplitView.swift b/Sources/Adwaita/View/Generated/OverlaySplitView.swift index 59e6e45..764e7c5 100644 --- a/Sources/Adwaita/View/Generated/OverlaySplitView.swift +++ b/Sources/Adwaita/View/Generated/OverlaySplitView.swift @@ -194,13 +194,6 @@ public struct OverlaySplitView: Widget { adw_overlay_split_view_set_sidebar(storage.pointer, sidebarStorage.pointer?.cast()) } - - storage.notify(name: "show-sidebar") { - let newValue = adw_overlay_split_view_get_show_sidebar(storage.pointer) != 0 -if let showSidebar, newValue != showSidebar.wrappedValue { - showSidebar.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -214,6 +207,13 @@ if let showSidebar, newValue != showSidebar.wrappedValue { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + + storage.notify(name: "show-sidebar") { + let newValue = adw_overlay_split_view_get_show_sidebar(storage.pointer) != 0 +if let showSidebar, newValue != showSidebar.wrappedValue { + showSidebar.wrappedValue = newValue +} + } if let collapsed, updateProperties { adw_overlay_split_view_set_collapsed(widget, collapsed.cBool) } diff --git a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift index 2f51b38..6dfc608 100644 --- a/Sources/Adwaita/View/Generated/PasswordEntryRow.swift +++ b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift @@ -102,7 +102,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) } @@ -126,6 +125,7 @@ public struct PasswordEntryRow: Widget { } } storage.modify { widget in + if let activatesDefault, updateProperties { adw_entry_row_set_activates_default(widget?.cast(), activatesDefault.cBool) } diff --git a/Sources/Adwaita/View/Generated/Popover.swift b/Sources/Adwaita/View/Generated/Popover.swift index e91a5fa..432e418 100644 --- a/Sources/Adwaita/View/Generated/Popover.swift +++ b/Sources/Adwaita/View/Generated/Popover.swift @@ -123,7 +123,6 @@ public struct Popover: Widget { gtk_popover_set_default_widget(storage.pointer?.cast(), defaultWidgetStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -147,6 +146,7 @@ public struct Popover: Widget { } } storage.modify { widget in + if let autohide, updateProperties { gtk_popover_set_autohide(widget?.cast(), autohide.cBool) } diff --git a/Sources/Adwaita/View/Generated/PreferencesGroup.swift b/Sources/Adwaita/View/Generated/PreferencesGroup.swift index d739de9..c9819fd 100644 --- a/Sources/Adwaita/View/Generated/PreferencesGroup.swift +++ b/Sources/Adwaita/View/Generated/PreferencesGroup.swift @@ -82,7 +82,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) } @@ -96,6 +95,7 @@ public struct PreferencesGroup: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let description, updateProperties { adw_preferences_group_set_description(widget?.cast(), description) } diff --git a/Sources/Adwaita/View/Generated/PreferencesPage.swift b/Sources/Adwaita/View/Generated/PreferencesPage.swift index fd72845..6ae24f3 100644 --- a/Sources/Adwaita/View/Generated/PreferencesPage.swift +++ b/Sources/Adwaita/View/Generated/PreferencesPage.swift @@ -63,7 +63,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) } @@ -77,6 +76,7 @@ public struct PreferencesPage: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let description, updateProperties { adw_preferences_page_set_description(widget?.cast(), description) } diff --git a/Sources/Adwaita/View/Generated/PreferencesRow.swift b/Sources/Adwaita/View/Generated/PreferencesRow.swift index bd28def..7094505 100644 --- a/Sources/Adwaita/View/Generated/PreferencesRow.swift +++ b/Sources/Adwaita/View/Generated/PreferencesRow.swift @@ -57,7 +57,6 @@ public struct PreferencesRow: Widget { let storage = ViewStorage(adw_preferences_row_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -71,6 +70,7 @@ public struct PreferencesRow: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let title, updateProperties { adw_preferences_row_set_title(widget?.cast(), title) } diff --git a/Sources/Adwaita/View/Generated/ProgressBar.swift b/Sources/Adwaita/View/Generated/ProgressBar.swift index f9e0efa..c245d08 100644 --- a/Sources/Adwaita/View/Generated/ProgressBar.swift +++ b/Sources/Adwaita/View/Generated/ProgressBar.swift @@ -100,7 +100,6 @@ public struct ProgressBar: Widget { let storage = ViewStorage(gtk_progress_bar_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -114,6 +113,7 @@ public struct ProgressBar: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let fraction, updateProperties { gtk_progress_bar_set_fraction(widget, fraction) } diff --git a/Sources/Adwaita/View/Generated/ScrolledWindow.swift b/Sources/Adwaita/View/Generated/ScrolledWindow.swift index 92a68df..964ee2f 100644 --- a/Sources/Adwaita/View/Generated/ScrolledWindow.swift +++ b/Sources/Adwaita/View/Generated/ScrolledWindow.swift @@ -180,7 +180,6 @@ public struct ScrolledWindow: Widget { gtk_scrolled_window_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -214,6 +213,7 @@ public struct ScrolledWindow: Widget { } } storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/SearchBar.swift b/Sources/Adwaita/View/Generated/SearchBar.swift index 3592973..00f219e 100644 --- a/Sources/Adwaita/View/Generated/SearchBar.swift +++ b/Sources/Adwaita/View/Generated/SearchBar.swift @@ -95,7 +95,6 @@ public struct SearchBar: Widget { gtk_search_bar_set_key_capture_widget(storage.pointer, keyCaptureWidgetStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -109,6 +108,7 @@ public struct SearchBar: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/SearchEntry.swift b/Sources/Adwaita/View/Generated/SearchEntry.swift index f23c24d..e9b095b 100644 --- a/Sources/Adwaita/View/Generated/SearchEntry.swift +++ b/Sources/Adwaita/View/Generated/SearchEntry.swift @@ -170,13 +170,6 @@ public struct SearchEntry: Widget { let storage = ViewStorage(gtk_search_entry_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - - storage.notify(name: "text") { - let newValue = String(cString: gtk_editable_get_text(storage.pointer)) -if let text, newValue != text.wrappedValue { - text.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -235,6 +228,13 @@ if let text, newValue != text.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "text") { + let newValue = String(cString: gtk_editable_get_text(storage.pointer)) +if let text, newValue != text.wrappedValue { + text.wrappedValue = newValue +} + } if let editable, updateProperties { gtk_editable_set_editable(widget, editable.cBool) } diff --git a/Sources/Adwaita/View/Generated/SpinRow.swift b/Sources/Adwaita/View/Generated/SpinRow.swift index 30e8c9d..d777e27 100644 --- a/Sources/Adwaita/View/Generated/SpinRow.swift +++ b/Sources/Adwaita/View/Generated/SpinRow.swift @@ -147,13 +147,6 @@ public struct SpinRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - - storage.notify(name: "value") { - let newValue = adw_spin_row_get_value(storage.pointer) -if let value, newValue != value.wrappedValue { - value.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -187,6 +180,13 @@ if let value, newValue != value.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "value") { + let newValue = adw_spin_row_get_value(storage.pointer) +if let value, newValue != value.wrappedValue { + value.wrappedValue = newValue +} + } if let widget = storage.content["activatableWidget"]?.first { activatableWidget?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/Spinner.swift b/Sources/Adwaita/View/Generated/Spinner.swift index 3c1dc4b..86b65bf 100644 --- a/Sources/Adwaita/View/Generated/Spinner.swift +++ b/Sources/Adwaita/View/Generated/Spinner.swift @@ -52,7 +52,6 @@ public struct Spinner: Widget { let storage = ViewStorage(gtk_spinner_new()?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -66,6 +65,7 @@ public struct Spinner: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let spinning, updateProperties { gtk_spinner_set_spinning(widget, spinning.cBool) } diff --git a/Sources/Adwaita/View/Generated/SplitButton.swift b/Sources/Adwaita/View/Generated/SplitButton.swift index 5ff036e..34eef0b 100644 --- a/Sources/Adwaita/View/Generated/SplitButton.swift +++ b/Sources/Adwaita/View/Generated/SplitButton.swift @@ -122,7 +122,6 @@ public struct SplitButton: Widget { } } - for function in appearFunctions { function(storage) } @@ -146,6 +145,7 @@ public struct SplitButton: Widget { } } storage.modify { widget in + if let canShrink, updateProperties { adw_split_button_set_can_shrink(widget, canShrink.cBool) } diff --git a/Sources/Adwaita/View/Generated/StatusPage.swift b/Sources/Adwaita/View/Generated/StatusPage.swift index 95d5462..0a46314 100644 --- a/Sources/Adwaita/View/Generated/StatusPage.swift +++ b/Sources/Adwaita/View/Generated/StatusPage.swift @@ -61,7 +61,6 @@ public struct StatusPage: Widget { adw_status_page_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -75,6 +74,7 @@ public struct StatusPage: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/SwitchRow.swift b/Sources/Adwaita/View/Generated/SwitchRow.swift index aca990c..8401f04 100644 --- a/Sources/Adwaita/View/Generated/SwitchRow.swift +++ b/Sources/Adwaita/View/Generated/SwitchRow.swift @@ -122,13 +122,6 @@ public struct SwitchRow: Widget { adw_action_row_add_prefix(storage.pointer?.cast(), prefixStorage.last?.pointer?.cast()) } storage.content["prefix"] = prefixStorage - - storage.notify(name: "active") { - let newValue = adw_switch_row_get_active(storage.pointer) != 0 -if let active, newValue != active.wrappedValue { - active.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -147,6 +140,13 @@ if let active, newValue != active.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "active") { + let newValue = adw_switch_row_get_active(storage.pointer) != 0 +if let active, newValue != active.wrappedValue { + active.wrappedValue = newValue +} + } if let widget = storage.content["activatableWidget"]?.first { activatableWidget?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/ToastOverlay.swift b/Sources/Adwaita/View/Generated/ToastOverlay.swift index be0b99e..3169741 100644 --- a/Sources/Adwaita/View/Generated/ToastOverlay.swift +++ b/Sources/Adwaita/View/Generated/ToastOverlay.swift @@ -73,7 +73,6 @@ public struct ToastOverlay: Widget { adw_toast_overlay_set_child(storage.pointer, childStorage.pointer?.cast()) } - for function in appearFunctions { function(storage) } @@ -87,6 +86,7 @@ public struct ToastOverlay: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["child"]?.first { child?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/ToggleButton.swift b/Sources/Adwaita/View/Generated/ToggleButton.swift index ff5d455..8a04759 100644 --- a/Sources/Adwaita/View/Generated/ToggleButton.swift +++ b/Sources/Adwaita/View/Generated/ToggleButton.swift @@ -149,13 +149,6 @@ public struct ToggleButton: Widget { gtk_button_set_child(storage.pointer?.cast(), childStorage.pointer?.cast()) } - - storage.notify(name: "active") { - let newValue = gtk_toggle_button_get_active(storage.pointer?.cast()) != 0 -if let active, newValue != active.wrappedValue { - active.wrappedValue = newValue -} - } for function in appearFunctions { function(storage) } @@ -184,6 +177,13 @@ if let active, newValue != active.wrappedValue { } } storage.modify { widget in + + storage.notify(name: "active") { + let newValue = gtk_toggle_button_get_active(storage.pointer?.cast()) != 0 +if let active, newValue != active.wrappedValue { + active.wrappedValue = newValue +} + } if let actionName, updateProperties { gtk_actionable_set_action_name(widget, actionName) } diff --git a/Sources/Adwaita/View/Generated/ToolbarView.swift b/Sources/Adwaita/View/Generated/ToolbarView.swift index 9da33f1..940ed56 100644 --- a/Sources/Adwaita/View/Generated/ToolbarView.swift +++ b/Sources/Adwaita/View/Generated/ToolbarView.swift @@ -170,7 +170,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) } @@ -184,6 +183,7 @@ public struct ToolbarView: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if let widget = storage.content["content"]?.first { content?().widget(modifiers: modifiers).update(widget, modifiers: modifiers, updateProperties: updateProperties) } diff --git a/Sources/Adwaita/View/Generated/WindowTitle.swift b/Sources/Adwaita/View/Generated/WindowTitle.swift index b59d055..478defe 100644 --- a/Sources/Adwaita/View/Generated/WindowTitle.swift +++ b/Sources/Adwaita/View/Generated/WindowTitle.swift @@ -52,7 +52,6 @@ public struct WindowTitle: Widget { let storage = ViewStorage(adw_window_title_new(title, subtitle)?.opaque()) update(storage, modifiers: modifiers, updateProperties: true) - for function in appearFunctions { function(storage) } @@ -66,6 +65,7 @@ public struct WindowTitle: Widget { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { storage.modify { widget in + if updateProperties { adw_window_title_set_subtitle(widget, subtitle) } diff --git a/Sources/Generation/GIR/Class.swift b/Sources/Generation/GIR/Class.swift index 80193bc..07d7a97 100644 --- a/Sources/Generation/GIR/Class.swift +++ b/Sources/Generation/GIR/Class.swift @@ -99,7 +99,6 @@ struct Class: ClassLike, Decodable { 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)) - \(generateBindingAssignments(config: config, genConfig: genConfig, namespace: namespace, configs: configs)) for function in appearFunctions { function(storage) } @@ -113,6 +112,7 @@ struct Class: ClassLike, Decodable { /// - updateProperties: Whether to update the view's properties. public func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) {\(generateSignalModifications(config: config, genConfig: genConfig, namespace: namespace)) storage.modify { widget in + \(generateBindingAssignments(config: config, genConfig: genConfig, namespace: namespace, configs: configs)) \(generateModifications(config: config, genConfig: genConfig, namespace: namespace, configs: configs)) \(generateDynamicWidgetUpdate(config: config, genConfig: genConfig)) }