github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 19:50:15 +08:00
Code Projects Activity

Windows dialogs - Handle scenario when window is not visible yet. (#1662)

Browse Source 
* Handle scenario when window is not visible yet.

* Handle scenario when window is not visible yet for all dialogs
This commit is contained in:
Lea Anthony 2022-07-27 19:38:56 +10:00 committed by GitHub
parent 229d36207c
commit a229e04e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
v2/internal/frontend/desktop/windows/dialog.go
View File

@ -5,11 +5,19 @@ package windows
import ( import (
"github.com/wailsapp/wails/v2/internal/frontend" "github.com/wailsapp/wails/v2/internal/frontend"
"github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32"
"github.com/wailsapp/wails/v2/internal/go-common-file-dialog/cfd" "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/cfd"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"syscall" "syscall"
) )
func (f *Frontend) getHandleForDialog() w32.HWND {
if f.mainWindow.IsVisible() {
return f.mainWindow.Handle()
}
return 0
}
// OpenDirectoryDialog prompts the user to select a directory // OpenDirectoryDialog prompts the user to select a directory
func (f *Frontend) OpenDirectoryDialog(options frontend.OpenDialogOptions) (string, error) { func (f *Frontend) OpenDirectoryDialog(options frontend.OpenDialogOptions) (string, error) {
config := cfd.DialogConfig{ config := cfd.DialogConfig{
@ -21,7 +29,7 @@ func (f *Frontend) OpenDirectoryDialog(options frontend.OpenDialogOptions) (stri
if err != nil { if err != nil {
return "", err return "", err
} }
thisDialog.SetParentWindowHandle(f.mainWindow.Handle()) thisDialog.SetParentWindowHandle(f.getHandleForDialog())
defer func(thisDialog cfd.SelectFolderDialog) { defer func(thisDialog cfd.SelectFolderDialog) {
err := thisDialog.Release() err := thisDialog.Release()
if err != nil { if err != nil {
@ -47,7 +55,7 @@ func (f *Frontend) OpenFileDialog(options frontend.OpenDialogOptions) (string, e
if err != nil { if err != nil {
return "", err return "", err
} }
thisdialog.SetParentWindowHandle(f.mainWindow.Handle()) thisdialog.SetParentWindowHandle(f.getHandleForDialog())
defer func(thisdialog cfd.OpenFileDialog) { defer func(thisdialog cfd.OpenFileDialog) {
err := thisdialog.Release() err := thisdialog.Release()
if err != nil { if err != nil {
@ -74,7 +82,7 @@ func (f *Frontend) OpenMultipleFilesDialog(dialogOptions frontend.OpenDialogOpti
if err != nil { if err != nil {
return nil, err return nil, err
} }
thisdialog.SetParentWindowHandle(f.mainWindow.Handle()) thisdialog.SetParentWindowHandle(f.getHandleForDialog())
defer func(thisdialog cfd.OpenMultipleFilesDialog) { defer func(thisdialog cfd.OpenMultipleFilesDialog) {
err := thisdialog.Release() err := thisdialog.Release()
if err != nil { if err != nil {
@ -100,7 +108,7 @@ func (f *Frontend) SaveFileDialog(dialogOptions frontend.SaveDialogOptions) (str
if err != nil { if err != nil {
return "", err return "", err
} }
saveDialog.SetParentWindowHandle(f.mainWindow.Handle()) saveDialog.SetParentWindowHandle(f.getHandleForDialog())
err = saveDialog.Show() err = saveDialog.Show()
if err != nil { if err != nil {
return "", err return "", err
@ -135,7 +143,7 @@ func (f *Frontend) MessageDialog(options frontend.MessageDialogOptions) (string,
flags = windows.MB_OK | windows.MB_ICONWARNING flags = windows.MB_OK | windows.MB_ICONWARNING
} }
button, _ := windows.MessageBox(windows.HWND(f.mainWindow.Handle()), message, title, flags|windows.MB_SYSTEMMODAL) button, _ := windows.MessageBox(windows.HWND(f.getHandleForDialog()), message, title, flags|windows.MB_SYSTEMMODAL)
// This maps MessageBox return values to strings // This maps MessageBox return values to strings
responses := []string{"", "Ok", "Cancel", "Abort", "Retry", "Ignore", "Yes", "No", "", "", "Try Again", "Continue"} responses := []string{"", "Ok", "Cancel", "Abort", "Retry", "Ignore", "Yes", "No", "", "", "Try Again", "Continue"}
result := "Error" result := "Error"

1
v2/internal/frontend/desktop/windows/win32/consts.go
View File

@ -18,6 +18,7 @@ var (
procSetClassLong = moduser32.NewProc("SetClassLongW") procSetClassLong = moduser32.NewProc("SetClassLongW")
procSetClassLongPtr = moduser32.NewProc("SetClassLongPtrW") procSetClassLongPtr = moduser32.NewProc("SetClassLongPtrW")
procShowWindow = moduser32.NewProc("ShowWindow") procShowWindow = moduser32.NewProc("ShowWindow")
procIsWindowVisible = moduser32.NewProc("IsWindowVisible")
) )
var ( var (
moddwmapi = syscall.NewLazyDLL("dwmapi.dll") moddwmapi = syscall.NewLazyDLL("dwmapi.dll")

5
v2/internal/frontend/desktop/windows/win32/window.go
View File

@ -78,6 +78,11 @@ func ExtendFrameIntoClientArea(hwnd uintptr) {
} }
} }
func IsVisible(hwnd uintptr) bool {
ret, _, _ := procIsWindowVisible.Call(hwnd)
return ret != 0
}
func IsWindowMaximised(hwnd uintptr) bool { func IsWindowMaximised(hwnd uintptr) bool {
style := uint32(getWindowLong(hwnd, GWL_STYLE)) style := uint32(getWindowLong(hwnd, GWL_STYLE))
return style&WS_MAXIMIZE != 0 return style&WS_MAXIMIZE != 0

8
v2/internal/frontend/desktop/windows/window.go
View File

@ -30,8 +30,8 @@ type Window struct {
theme winoptions.Theme theme winoptions.Theme
themeChanged bool themeChanged bool
OnSuspend func() OnSuspend func()
OnResume func() OnResume func()
} }
func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *operatingsystem.WindowsVersionInfo) *Window { func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *operatingsystem.WindowsVersionInfo) *Window {
@ -158,6 +158,10 @@ func (w *Window) SetMaxSize(maxWidth int, maxHeight int) {
w.Form.SetMaxSize(maxWidth, maxHeight) w.Form.SetMaxSize(maxWidth, maxHeight)
} }
func (w *Window) IsVisible() bool {
return win32.IsVisible(w.Handle())
}
func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr {
switch msg { switch msg {