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

Move SetMin/Max calls to main thread (#1684)

Browse Source 
* Move SetMin/MAx calls to main thread

* Move setsize back to original location

* Remove debug
This commit is contained in:
Lea Anthony 2022-08-02 06:51:20 +10:00 committed by GitHub
parent 6154bdac90
commit 224f7c0c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
v2/internal/frontend/desktop/linux/window.go
View File

@ -645,11 +645,11 @@ func NewWindow(appoptions *options.App, debug bool) *Window {
// Setup window // Setup window
result.SetKeepAbove(appoptions.AlwaysOnTop) result.SetKeepAbove(appoptions.AlwaysOnTop)
result.SetResizable(!appoptions.DisableResize) result.SetResizable(!appoptions.DisableResize)
result.SetSize(appoptions.Width, appoptions.Height)
result.SetDecorated(!appoptions.Frameless) result.SetDecorated(!appoptions.Frameless)
result.SetTitle(appoptions.Title) result.SetTitle(appoptions.Title)
result.SetMinSize(appoptions.MinWidth, appoptions.MinHeight) result.SetMinSize(appoptions.MinWidth, appoptions.MinHeight)
result.SetMaxSize(appoptions.MaxWidth, appoptions.MaxHeight) result.SetMaxSize(appoptions.MaxWidth, appoptions.MaxHeight)
result.SetSize(appoptions.Width, appoptions.Height)
if appoptions.Linux != nil { if appoptions.Linux != nil {
if appoptions.Linux.Icon != nil { if appoptions.Linux.Icon != nil {
result.SetWindowIcon(appoptions.Linux.Icon) result.SetWindowIcon(appoptions.Linux.Icon)
@ -735,13 +735,17 @@ func (w *Window) GetPosition() (int, int) {
func (w *Window) SetMaxSize(maxWidth int, maxHeight int) { func (w *Window) SetMaxSize(maxWidth int, maxHeight int) {
w.maxHeight = maxHeight w.maxHeight = maxHeight
w.maxWidth = maxWidth w.maxWidth = maxWidth
C.SetMinMaxSize(w.asGTKWindow(), C.int(w.minWidth), C.int(w.minHeight), C.int(w.maxWidth), C.int(w.maxHeight)) invokeOnMainThread(func() {
C.SetMinMaxSize(w.asGTKWindow(), C.int(w.minWidth), C.int(w.minHeight), C.int(w.maxWidth), C.int(w.maxHeight))
})
} }
func (w *Window) SetMinSize(minWidth int, minHeight int) { func (w *Window) SetMinSize(minWidth int, minHeight int) {
w.minHeight = minHeight w.minHeight = minHeight
w.minWidth = minWidth w.minWidth = minWidth
C.SetMinMaxSize(w.asGTKWindow(), C.int(w.minWidth), C.int(w.minHeight), C.int(w.maxWidth), C.int(w.maxHeight)) invokeOnMainThread(func() {
C.SetMinMaxSize(w.asGTKWindow(), C.int(w.minWidth), C.int(w.minHeight), C.int(w.maxWidth), C.int(w.maxHeight))
})
} }
func (w *Window) Show() { func (w *Window) Show() {