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

[linux] Fix min/max size after fullscreen

Browse Source
This commit is contained in:
Lea Anthony 2022-02-08 07:04:45 +11:00
parent 30a4f47cba
commit 3d02a314b9
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,16 +495,17 @@ func gtkBool(input bool) C.gboolean {
} }
type Window struct { type Window struct {
appoptions *options.App appoptions *options.App
debug bool debug bool
gtkWindow unsafe.Pointer gtkWindow unsafe.Pointer
contentManager unsafe.Pointer contentManager unsafe.Pointer
webview unsafe.Pointer webview unsafe.Pointer
applicationMenu *menu.Menu applicationMenu *menu.Menu
menubar *C.GtkWidget menubar *C.GtkWidget
vbox *C.GtkWidget vbox *C.GtkWidget
accels *C.GtkAccelGroup accels *C.GtkAccelGroup
minWidth, minHeight, maxWidth, maxHeight int minWidth, minHeight, maxWidth, maxHeight int
tempMaxWidth, tempMinWidth, tempMaxHeight, tempMinHeight int
} }
func bool2Cint(value bool) C.int { func bool2Cint(value bool) C.int {
@ -586,6 +587,10 @@ func (w *Window) cWebKitUserContentManager() *C.WebKitUserContentManager {
} }
func (w *Window) Fullscreen() { func (w *Window) Fullscreen() {
w.tempMaxWidth = w.maxWidth
w.tempMaxHeight = w.maxHeight
w.tempMinWidth = w.minWidth
w.tempMinHeight = w.minHeight
w.SetMaxSize(0, 0) w.SetMaxSize(0, 0)
w.SetMinSize(0, 0) w.SetMinSize(0, 0)
C.ExecuteOnMainThread(C.gtk_window_fullscreen, C.gpointer(w.asGTKWindow())) C.ExecuteOnMainThread(C.gtk_window_fullscreen, C.gpointer(w.asGTKWindow()))
@ -593,8 +598,8 @@ func (w *Window) Fullscreen() {
func (w *Window) UnFullscreen() { func (w *Window) UnFullscreen() {
C.ExecuteOnMainThread(C.gtk_window_unfullscreen, C.gpointer(w.asGTKWindow())) C.ExecuteOnMainThread(C.gtk_window_unfullscreen, C.gpointer(w.asGTKWindow()))
w.SetMaxSize(w.maxWidth, w.maxHeight) w.SetMaxSize(w.tempMaxWidth, w.tempMaxHeight)
w.SetMinSize(w.minWidth, w.minHeight) w.SetMinSize(w.tempMinWidth, w.tempMinHeight)
} }
func (w *Window) Destroy() { func (w *Window) Destroy() {