Revert "chore(deps): pin puregotk nil-signal fix"
This reverts commit a161e348e2093172038390b0906448f0ae979a0d.
- commit
- 40378d5e4fd2372d054e49168ab2a6f67aedd0fd
- author
- brice · · 2026-07-14 17:59 UTC
- parent
- 8d647bb
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
905 files · +25263 -27842
M go.mod +1 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -118,7 +119,6 @@ type MultiLayoutView struct { | |||
| 118 | 119 | var xMultiLayoutViewGLibType func() types.GType | |
| 119 | 120 | ||
| 120 | 121 | func MultiLayoutViewGLibType() types.GType { | |
| 121 | - | core.LazyRegister(&xMultiLayoutViewGLibType, "ADW", "adw_multi_layout_view_get_type", false) | |
| 122 | 122 | return xMultiLayoutViewGLibType() | |
| 123 | 123 | } | |
| 124 | 124 | ||
| @@ -132,7 +132,6 @@ var xNewMultiLayoutView func() uintptr | |||
| 132 | 132 | ||
| 133 | 133 | // Creates a new `AdwMultiLayoutView`. | |
| 134 | 134 | func NewMultiLayoutView() *MultiLayoutView { | |
| 135 | - | core.LazyRegister(&xNewMultiLayoutView, "ADW", "adw_multi_layout_view_new", false) | |
| 136 | 135 | var cls *MultiLayoutView | |
| 137 | 136 | ||
| 138 | 137 | cret := xNewMultiLayoutView() | |
| @@ -150,8 +149,6 @@ var xMultiLayoutViewAddLayout func(uintptr, uintptr) | |||
| 150 | 149 | ||
| 151 | 150 | // Adds @layout to @self. | |
| 152 | 151 | func (x *MultiLayoutView) AddLayout(LayoutVar *Layout) { | |
| 153 | - | core.LazyRegister(&xMultiLayoutViewAddLayout, "ADW", "adw_multi_layout_view_add_layout", false) | |
| 154 | - | ||
| 155 | 152 | xMultiLayoutViewAddLayout(x.GoPointer(), LayoutVar.GoPointer()) | |
| 156 | 153 | } | |
| 157 | 154 | ||
| @@ -159,7 +156,6 @@ var xMultiLayoutViewGetChild func(uintptr, string) uintptr | |||
| 159 | 156 | ||
| 160 | 157 | // Gets the child for @id to @self. | |
| 161 | 158 | func (x *MultiLayoutView) GetChild(IdVar string) *gtk.Widget { | |
| 162 | - | core.LazyRegister(&xMultiLayoutViewGetChild, "ADW", "adw_multi_layout_view_get_child", false) | |
| 163 | 159 | var cls *gtk.Widget | |
| 164 | 160 | ||
| 165 | 161 | cret := xMultiLayoutViewGetChild(x.GoPointer(), IdVar) | |
| @@ -177,7 +173,6 @@ var xMultiLayoutViewGetLayout func(uintptr) uintptr | |||
| 177 | 173 | ||
| 178 | 174 | // Gets the currently used layout of @self. | |
| 179 | 175 | func (x *MultiLayoutView) GetLayout() *Layout { | |
| 180 | - | core.LazyRegister(&xMultiLayoutViewGetLayout, "ADW", "adw_multi_layout_view_get_layout", false) | |
| 181 | 176 | var cls *Layout | |
| 182 | 177 | ||
| 183 | 178 | cret := xMultiLayoutViewGetLayout(x.GoPointer()) | |
| @@ -197,7 +192,6 @@ var xMultiLayoutViewGetLayoutByName func(uintptr, string) uintptr | |||
| 197 | 192 | // | |
| 198 | 193 | // See [property@Layout:name]. | |
| 199 | 194 | func (x *MultiLayoutView) GetLayoutByName(NameVar string) *Layout { | |
| 200 | - | core.LazyRegister(&xMultiLayoutViewGetLayoutByName, "ADW", "adw_multi_layout_view_get_layout_by_name", false) | |
| 201 | 195 | var cls *Layout | |
| 202 | 196 | ||
| 203 | 197 | cret := xMultiLayoutViewGetLayoutByName(x.GoPointer(), NameVar) | |
| @@ -215,8 +209,6 @@ var xMultiLayoutViewGetLayoutName func(uintptr) string | |||
| 215 | 209 | ||
| 216 | 210 | // Returns the name of the currently used layout of @self. | |
| 217 | 211 | func (x *MultiLayoutView) GetLayoutName() string { | |
| 218 | - | core.LazyRegister(&xMultiLayoutViewGetLayoutName, "ADW", "adw_multi_layout_view_get_layout_name", false) | |
| 219 | - | ||
| 220 | 212 | cret := xMultiLayoutViewGetLayoutName(x.GoPointer()) | |
| 221 | 213 | return cret | |
| 222 | 214 | } | |
| @@ -225,8 +217,6 @@ var xMultiLayoutViewRemoveLayout func(uintptr, uintptr) | |||
| 225 | 217 | ||
| 226 | 218 | // Removes @layout from @self. | |
| 227 | 219 | func (x *MultiLayoutView) RemoveLayout(LayoutVar *Layout) { | |
| 228 | - | core.LazyRegister(&xMultiLayoutViewRemoveLayout, "ADW", "adw_multi_layout_view_remove_layout", false) | |
| 229 | - | ||
| 230 | 220 | xMultiLayoutViewRemoveLayout(x.GoPointer(), LayoutVar.GoPointer()) | |
| 231 | 221 | } | |
| 232 | 222 | ||
| @@ -236,8 +226,6 @@ var xMultiLayoutViewSetChild func(uintptr, string, uintptr) | |||
| 236 | 226 | // | |
| 237 | 227 | // When changing layouts, it will be inserted into the slot with @id. | |
| 238 | 228 | func (x *MultiLayoutView) SetChild(IdVar string, ChildVar *gtk.Widget) { | |
| 239 | - | core.LazyRegister(&xMultiLayoutViewSetChild, "ADW", "adw_multi_layout_view_set_child", false) | |
| 240 | - | ||
| 241 | 229 | xMultiLayoutViewSetChild(x.GoPointer(), IdVar, ChildVar.GoPointer()) | |
| 242 | 230 | } | |
| 243 | 231 | ||
| @@ -245,8 +233,6 @@ var xMultiLayoutViewSetLayout func(uintptr, uintptr) | |||
| 245 | 233 | ||
| 246 | 234 | // Makes @layout the current layout of @self. | |
| 247 | 235 | func (x *MultiLayoutView) SetLayout(LayoutVar *Layout) { | |
| 248 | - | core.LazyRegister(&xMultiLayoutViewSetLayout, "ADW", "adw_multi_layout_view_set_layout", false) | |
| 249 | - | ||
| 250 | 236 | xMultiLayoutViewSetLayout(x.GoPointer(), LayoutVar.GoPointer()) | |
| 251 | 237 | } | |
| 252 | 238 | ||
| @@ -256,8 +242,6 @@ var xMultiLayoutViewSetLayoutName func(uintptr, string) | |||
| 256 | 242 | // | |
| 257 | 243 | // See [property@Layout:name]. | |
| 258 | 244 | func (x *MultiLayoutView) SetLayoutName(NameVar string) { | |
| 259 | - | core.LazyRegister(&xMultiLayoutViewSetLayoutName, "ADW", "adw_multi_layout_view_set_layout_name", false) | |
| 260 | - | ||
| 261 | 245 | xMultiLayoutViewSetLayoutName(x.GoPointer(), NameVar) | |
| 262 | 246 | } | |
| 263 | 247 | ||
| @@ -556,4 +540,26 @@ func (x *MultiLayoutView) GetBuildableId() string { | |||
| 556 | 540 | func init() { | |
| 557 | 541 | core.SetPackageName("ADW", "libadwaita-1") | |
| 558 | 542 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 543 | + | var libs []uintptr | |
| 544 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 545 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 546 | + | if err != nil { | |
| 547 | + | panic(err) | |
| 548 | + | } | |
| 549 | + | libs = append(libs, lib) | |
| 550 | + | } | |
| 551 | + | ||
| 552 | + | core.PuregoSafeRegister(&xMultiLayoutViewGLibType, libs, "adw_multi_layout_view_get_type") | |
| 553 | + | ||
| 554 | + | core.PuregoSafeRegister(&xNewMultiLayoutView, libs, "adw_multi_layout_view_new") | |
| 555 | + | ||
| 556 | + | core.PuregoSafeRegister(&xMultiLayoutViewAddLayout, libs, "adw_multi_layout_view_add_layout") | |
| 557 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetChild, libs, "adw_multi_layout_view_get_child") | |
| 558 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayout, libs, "adw_multi_layout_view_get_layout") | |
| 559 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutByName, libs, "adw_multi_layout_view_get_layout_by_name") | |
| 560 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutName, libs, "adw_multi_layout_view_get_layout_name") | |
| 561 | + | core.PuregoSafeRegister(&xMultiLayoutViewRemoveLayout, libs, "adw_multi_layout_view_remove_layout") | |
| 562 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetChild, libs, "adw_multi_layout_view_set_child") | |
| 563 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayout, libs, "adw_multi_layout_view_set_layout") | |
| 564 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayoutName, libs, "adw_multi_layout_view_set_layout_name") | |
| 559 | 565 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -118,7 +119,6 @@ type MultiLayoutView struct { | |||||
| 118 | var xMultiLayoutViewGLibType func() types.GType | 119 | var xMultiLayoutViewGLibType func() types.GType | ||
| 119 | 120 | ||||
| 120 | func MultiLayoutViewGLibType() types.GType { | 121 | func MultiLayoutViewGLibType() types.GType { | ||
| 121 | - | core.LazyRegister(&xMultiLayoutViewGLibType, "ADW", "adw_multi_layout_view_get_type", false) | |||
| 122 | return xMultiLayoutViewGLibType() | 122 | return xMultiLayoutViewGLibType() | ||
| 123 | } | 123 | } | ||
| 124 | 124 | ||||
| @@ -132,7 +132,6 @@ var xNewMultiLayoutView func() uintptr | |||||
| 132 | 132 | ||||
| 133 | // Creates a new `AdwMultiLayoutView`. | 133 | // Creates a new `AdwMultiLayoutView`. | ||
| 134 | func NewMultiLayoutView() *MultiLayoutView { | 134 | func NewMultiLayoutView() *MultiLayoutView { | ||
| 135 | - | core.LazyRegister(&xNewMultiLayoutView, "ADW", "adw_multi_layout_view_new", false) | |||
| 136 | var cls *MultiLayoutView | 135 | var cls *MultiLayoutView | ||
| 137 | 136 | ||||
| 138 | cret := xNewMultiLayoutView() | 137 | cret := xNewMultiLayoutView() | ||
| @@ -150,8 +149,6 @@ var xMultiLayoutViewAddLayout func(uintptr, uintptr) | |||||
| 150 | 149 | ||||
| 151 | // Adds @layout to @self. | 150 | // Adds @layout to @self. | ||
| 152 | func (x *MultiLayoutView) AddLayout(LayoutVar *Layout) { | 151 | func (x *MultiLayoutView) AddLayout(LayoutVar *Layout) { | ||
| 153 | - | core.LazyRegister(&xMultiLayoutViewAddLayout, "ADW", "adw_multi_layout_view_add_layout", false) | |||
| 154 | - | ||||
| 155 | xMultiLayoutViewAddLayout(x.GoPointer(), LayoutVar.GoPointer()) | 152 | xMultiLayoutViewAddLayout(x.GoPointer(), LayoutVar.GoPointer()) | ||
| 156 | } | 153 | } | ||
| 157 | 154 | ||||
| @@ -159,7 +156,6 @@ var xMultiLayoutViewGetChild func(uintptr, string) uintptr | |||||
| 159 | 156 | ||||
| 160 | // Gets the child for @id to @self. | 157 | // Gets the child for @id to @self. | ||
| 161 | func (x *MultiLayoutView) GetChild(IdVar string) *gtk.Widget { | 158 | func (x *MultiLayoutView) GetChild(IdVar string) *gtk.Widget { | ||
| 162 | - | core.LazyRegister(&xMultiLayoutViewGetChild, "ADW", "adw_multi_layout_view_get_child", false) | |||
| 163 | var cls *gtk.Widget | 159 | var cls *gtk.Widget | ||
| 164 | 160 | ||||
| 165 | cret := xMultiLayoutViewGetChild(x.GoPointer(), IdVar) | 161 | cret := xMultiLayoutViewGetChild(x.GoPointer(), IdVar) | ||
| @@ -177,7 +173,6 @@ var xMultiLayoutViewGetLayout func(uintptr) uintptr | |||||
| 177 | 173 | ||||
| 178 | // Gets the currently used layout of @self. | 174 | // Gets the currently used layout of @self. | ||
| 179 | func (x *MultiLayoutView) GetLayout() *Layout { | 175 | func (x *MultiLayoutView) GetLayout() *Layout { | ||
| 180 | - | core.LazyRegister(&xMultiLayoutViewGetLayout, "ADW", "adw_multi_layout_view_get_layout", false) | |||
| 181 | var cls *Layout | 176 | var cls *Layout | ||
| 182 | 177 | ||||
| 183 | cret := xMultiLayoutViewGetLayout(x.GoPointer()) | 178 | cret := xMultiLayoutViewGetLayout(x.GoPointer()) | ||
| @@ -197,7 +192,6 @@ var xMultiLayoutViewGetLayoutByName func(uintptr, string) uintptr | |||||
| 197 | // | 192 | // | ||
| 198 | // See [property@Layout:name]. | 193 | // See [property@Layout:name]. | ||
| 199 | func (x *MultiLayoutView) GetLayoutByName(NameVar string) *Layout { | 194 | func (x *MultiLayoutView) GetLayoutByName(NameVar string) *Layout { | ||
| 200 | - | core.LazyRegister(&xMultiLayoutViewGetLayoutByName, "ADW", "adw_multi_layout_view_get_layout_by_name", false) | |||
| 201 | var cls *Layout | 195 | var cls *Layout | ||
| 202 | 196 | ||||
| 203 | cret := xMultiLayoutViewGetLayoutByName(x.GoPointer(), NameVar) | 197 | cret := xMultiLayoutViewGetLayoutByName(x.GoPointer(), NameVar) | ||
| @@ -215,8 +209,6 @@ var xMultiLayoutViewGetLayoutName func(uintptr) string | |||||
| 215 | 209 | ||||
| 216 | // Returns the name of the currently used layout of @self. | 210 | // Returns the name of the currently used layout of @self. | ||
| 217 | func (x *MultiLayoutView) GetLayoutName() string { | 211 | func (x *MultiLayoutView) GetLayoutName() string { | ||
| 218 | - | core.LazyRegister(&xMultiLayoutViewGetLayoutName, "ADW", "adw_multi_layout_view_get_layout_name", false) | |||
| 219 | - | ||||
| 220 | cret := xMultiLayoutViewGetLayoutName(x.GoPointer()) | 212 | cret := xMultiLayoutViewGetLayoutName(x.GoPointer()) | ||
| 221 | return cret | 213 | return cret | ||
| 222 | } | 214 | } | ||
| @@ -225,8 +217,6 @@ var xMultiLayoutViewRemoveLayout func(uintptr, uintptr) | |||||
| 225 | 217 | ||||
| 226 | // Removes @layout from @self. | 218 | // Removes @layout from @self. | ||
| 227 | func (x *MultiLayoutView) RemoveLayout(LayoutVar *Layout) { | 219 | func (x *MultiLayoutView) RemoveLayout(LayoutVar *Layout) { | ||
| 228 | - | core.LazyRegister(&xMultiLayoutViewRemoveLayout, "ADW", "adw_multi_layout_view_remove_layout", false) | |||
| 229 | - | ||||
| 230 | xMultiLayoutViewRemoveLayout(x.GoPointer(), LayoutVar.GoPointer()) | 220 | xMultiLayoutViewRemoveLayout(x.GoPointer(), LayoutVar.GoPointer()) | ||
| 231 | } | 221 | } | ||
| 232 | 222 | ||||
| @@ -236,8 +226,6 @@ var xMultiLayoutViewSetChild func(uintptr, string, uintptr) | |||||
| 236 | // | 226 | // | ||
| 237 | // When changing layouts, it will be inserted into the slot with @id. | 227 | // When changing layouts, it will be inserted into the slot with @id. | ||
| 238 | func (x *MultiLayoutView) SetChild(IdVar string, ChildVar *gtk.Widget) { | 228 | func (x *MultiLayoutView) SetChild(IdVar string, ChildVar *gtk.Widget) { | ||
| 239 | - | core.LazyRegister(&xMultiLayoutViewSetChild, "ADW", "adw_multi_layout_view_set_child", false) | |||
| 240 | - | ||||
| 241 | xMultiLayoutViewSetChild(x.GoPointer(), IdVar, ChildVar.GoPointer()) | 229 | xMultiLayoutViewSetChild(x.GoPointer(), IdVar, ChildVar.GoPointer()) | ||
| 242 | } | 230 | } | ||
| 243 | 231 | ||||
| @@ -245,8 +233,6 @@ var xMultiLayoutViewSetLayout func(uintptr, uintptr) | |||||
| 245 | 233 | ||||
| 246 | // Makes @layout the current layout of @self. | 234 | // Makes @layout the current layout of @self. | ||
| 247 | func (x *MultiLayoutView) SetLayout(LayoutVar *Layout) { | 235 | func (x *MultiLayoutView) SetLayout(LayoutVar *Layout) { | ||
| 248 | - | core.LazyRegister(&xMultiLayoutViewSetLayout, "ADW", "adw_multi_layout_view_set_layout", false) | |||
| 249 | - | ||||
| 250 | xMultiLayoutViewSetLayout(x.GoPointer(), LayoutVar.GoPointer()) | 236 | xMultiLayoutViewSetLayout(x.GoPointer(), LayoutVar.GoPointer()) | ||
| 251 | } | 237 | } | ||
| 252 | 238 | ||||
| @@ -256,8 +242,6 @@ var xMultiLayoutViewSetLayoutName func(uintptr, string) | |||||
| 256 | // | 242 | // | ||
| 257 | // See [property@Layout:name]. | 243 | // See [property@Layout:name]. | ||
| 258 | func (x *MultiLayoutView) SetLayoutName(NameVar string) { | 244 | func (x *MultiLayoutView) SetLayoutName(NameVar string) { | ||
| 259 | - | core.LazyRegister(&xMultiLayoutViewSetLayoutName, "ADW", "adw_multi_layout_view_set_layout_name", false) | |||
| 260 | - | ||||
| 261 | xMultiLayoutViewSetLayoutName(x.GoPointer(), NameVar) | 245 | xMultiLayoutViewSetLayoutName(x.GoPointer(), NameVar) | ||
| 262 | } | 246 | } | ||
| 263 | 247 | ||||
| @@ -556,4 +540,26 @@ func (x *MultiLayoutView) GetBuildableId() string { | |||||
| 556 | func init() { | 540 | func init() { | ||
| 557 | core.SetPackageName("ADW", "libadwaita-1") | 541 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 558 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 542 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 543 | + | var libs []uintptr | |||
| 544 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 545 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 546 | + | if err != nil { | |||
| 547 | + | panic(err) | |||
| 548 | + | } | |||
| 549 | + | libs = append(libs, lib) | |||
| 550 | + | } | |||
| 551 | + | ||||
| 552 | + | core.PuregoSafeRegister(&xMultiLayoutViewGLibType, libs, "adw_multi_layout_view_get_type") | |||
| 553 | + | ||||
| 554 | + | core.PuregoSafeRegister(&xNewMultiLayoutView, libs, "adw_multi_layout_view_new") | |||
| 555 | + | ||||
| 556 | + | core.PuregoSafeRegister(&xMultiLayoutViewAddLayout, libs, "adw_multi_layout_view_add_layout") | |||
| 557 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetChild, libs, "adw_multi_layout_view_get_child") | |||
| 558 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayout, libs, "adw_multi_layout_view_get_layout") | |||
| 559 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutByName, libs, "adw_multi_layout_view_get_layout_by_name") | |||
| 560 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutName, libs, "adw_multi_layout_view_get_layout_name") | |||
| 561 | + | core.PuregoSafeRegister(&xMultiLayoutViewRemoveLayout, libs, "adw_multi_layout_view_remove_layout") | |||
| 562 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetChild, libs, "adw_multi_layout_view_set_child") | |||
| 563 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayout, libs, "adw_multi_layout_view_set_layout") | |||
| 564 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayoutName, libs, "adw_multi_layout_view_set_layout_name") | |||
| 559 | } | 565 | } | ||