github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-17 09:29:30 +08:00
Code Projects Activity

Proper syncing and canceling of dialogs

Browse Source 
s

s

s
This commit is contained in:
atterpac 2024-04-07 18:40:10 -06:00 committed by Travis McLane
parent 105d9f0d3a
commit 6f75b00463
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v3/pkg/application/dialogs.go
View File

@ -272,6 +272,7 @@ func (d *OpenFileDialogStruct) PromptForSingleSelection() (string, error) {
if err == nil { if err == nil {
result = <-selections result = <-selections
} }
close(selections)
return result, err return result, err
} }

4
v3/pkg/application/dialogs_linux.go
View File

@ -10,10 +10,12 @@ func (a *linuxApp) showAboutDialog(title string, message string, icon []byte) {
about.SetTitle(title). about.SetTitle(title).
SetMessage(message). SetMessage(message).
SetIcon(icon) SetIcon(icon)
InvokeAsync(func() {
runQuestionDialog( runQuestionDialog(
pointer(parent), pointer(parent),
about, about,
) )
})
} }
type linuxDialog struct { type linuxDialog struct {
@ -28,6 +30,7 @@ func (m *linuxDialog) show() {
parent, _ = window.(*WebviewWindow).NativeWindowHandle() parent, _ = window.(*WebviewWindow).NativeWindowHandle()
} }
InvokeAsync(func() {
response := runQuestionDialog(pointer(parent), m.dialog) response := runQuestionDialog(pointer(parent), m.dialog)
if response >= 0 && response < len(m.dialog.Buttons) { if response >= 0 && response < len(m.dialog.Buttons) {
button := m.dialog.Buttons[response] button := m.dialog.Buttons[response]
@ -35,6 +38,7 @@ func (m *linuxDialog) show() {
go button.Callback() go button.Callback()
} }
} }
})
} }
func newDialogImpl(d *MessageDialog) *linuxDialog { func newDialogImpl(d *MessageDialog) *linuxDialog {

3
v3/pkg/application/linux_cgo.go
View File

@ -1570,11 +1570,10 @@ func runChooserDialog(window pointer, allowMultiple, createFolders, showHidden b
} }
count++ count++
} }
close(selections)
C.gtk_widget_destroy((*C.GtkWidget)(unsafe.Pointer(fc)))
} }
}() }()
}) })
C.gtk_widget_destroy((*C.GtkWidget)(unsafe.Pointer(fc)))
return selections, nil return selections, nil
} }