From 9f235bf78dec38ffddac90f8dad21c71f7ac2856 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 21 Sep 2021 17:35:38 +1000 Subject: [PATCH] [windows] Fix fullscreen + drag --- v2/internal/frontend/desktop/windows/frontend.go | 8 +++++--- v2/internal/frontend/desktop/windows/window.go | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index ddc054ef3..e91478541 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -359,9 +359,11 @@ func (f *Frontend) processRequest(req *edge.ICoreWebView2WebResourceRequest, arg func (f *Frontend) processMessage(message string) { if message == "drag" { - err := f.startDrag() - if err != nil { - f.logger.Error(err.Error()) + if !f.mainWindow.IsFullScreen() { + err := f.startDrag() + if err != nil { + f.logger.Error(err.Error()) + } } return } diff --git a/v2/internal/frontend/desktop/windows/window.go b/v2/internal/frontend/desktop/windows/window.go index 9e743b8b9..cd3a5b6b9 100644 --- a/v2/internal/frontend/desktop/windows/window.go +++ b/v2/internal/frontend/desktop/windows/window.go @@ -51,10 +51,10 @@ func NewWindow(parent winc.Controller, options *options.App) *Window { } result.SetSize(options.Width, options.Height) - if options.Frameless == false { - result.SetText(options.Title) - result.EnableSizable(!options.DisableResize) + result.SetText(options.Title) + if options.Frameless == false && !options.Fullscreen { result.EnableMaxButton(!options.DisableResize) + result.EnableSizable(!options.DisableResize) result.SetMinSize(options.MinWidth, options.MinHeight) result.SetMaxSize(options.MaxWidth, options.MaxHeight) }