Revert "WIP"

This reverts commit b07fd60.
wailsapp · Jan 12, 2022 · 8b7d439 · 8b7d439
1 parent 1724912
commit 8b7d439
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 44 deletions.
diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go
@@ -173,15 +173,15 @@ func (f *Frontend) WindowFullscreen() {
 	f.mainWindow.SetMaxSize(0, 0)
 	f.mainWindow.SetMinSize(0, 0)
 	if f.frontendOptions.Frameless && f.frontendOptions.DisableResize == false {
-		f.ExecJS("window.wails.enableFramelessResize();")
+		f.ExecJS("window.wails.flags.enableResize = false;")
 	}
 	f.mainWindow.Fullscreen()
 }
 
 func (f *Frontend) WindowUnFullscreen() {
 	runtime.LockOSThread()
 	if f.frontendOptions.Frameless && f.frontendOptions.DisableResize == false {
-		f.ExecJS("window.wails.enableFramelessResize();")
+		f.ExecJS("window.wails.flags.enableResize = true;")
 	}
 	f.mainWindow.UnFullscreen()
 	f.mainWindow.SetMaxSize(f.maxWidth, f.maxHeight)
@@ -491,7 +491,7 @@ func (f *Frontend) navigationCompleted(sender *edge.ICoreWebView2, args *edge.IC
 	}
 
 	if f.frontendOptions.Frameless && f.frontendOptions.DisableResize == false {
-		f.ExecJS("window.wails.enableFramelessResize();")
+		f.ExecJS("window.wails.flags.enableResize = true;")
 	}
 
 	if f.hasStarted {

diff --git a/v2/internal/frontend/desktop/windows/window.go b/v2/internal/frontend/desktop/windows/window.go
@@ -57,10 +57,10 @@ func NewWindow(parent winc.Controller, appoptions *options.App) *Window {
 	result.SetText(appoptions.Title)
 	if appoptions.Frameless == false && !appoptions.Fullscreen {
 		result.EnableMaxButton(!appoptions.DisableResize)
-		result.EnableSizable(!appoptions.DisableResize)
 		result.SetMinSize(appoptions.MinWidth, appoptions.MinHeight)
 		result.SetMaxSize(appoptions.MaxWidth, appoptions.MaxHeight)
 	}
+	result.EnableSizable(!appoptions.DisableResize)
 
 	if appoptions.Windows != nil {
 		if appoptions.Windows.WindowIsTranslucent {

diff --git a/v2/internal/frontend/runtime/desktop/main.js b/v2/internal/frontend/runtime/desktop/main.js
@@ -43,11 +43,9 @@ window.wails = {
     flags: {
         disableScrollbarDrag: false,
         disableWailsDefaultContextMenu: false,
-        enableFramelessResize: false,
+        enableResize: false,
         defaultCursor: null
-    },
-    enableFramelessResize,
-    disableFramelessResize
+    }
 };
 
 // Set the bindings
@@ -66,7 +64,7 @@ if (ENV === 0) {
 window.addEventListener('mousedown', (e) => {
 
     // Check for resizing
-    if (window.wails.flags.enableFramelessResize && window.wails.flags.resizeEdge) {
+    if (window.wails.flags.resizeEdge) {
         window.WailsInvoke("resize:" + window.wails.flags.resizeEdge);
         e.preventDefault();
         return;
@@ -97,7 +95,7 @@ function setResize(cursor) {
     window.wails.flags.resizeEdge = cursor;
 }
 
-function mouseHandler(e) {
+window.addEventListener('mousemove', function (e) {
     if (!window.wails.flags.enableResize) {
         return;
     }
@@ -124,17 +122,7 @@ function mouseHandler(e) {
     else if (bottomBorder) setResize("s-resize");
     else if (rightBorder) setResize("e-resize");
 
-}
-
-export function enableFramelessResize() {
-    window.wails.flags.enableFramelessResize = true;
-    window.addEventListener('mousemove', mouseHandler);
-}
-
-export function disableFramelessResize() {
-    window.wails.flags.enableFramelessResize = false;
-    window.removeEventListener('mousemove', mouseHandler);
-}
+});
 
 // Setup context menu hook
 window.addEventListener('contextmenu', function (e) {

diff --git a/v2/internal/frontend/runtime/runtime_dev_desktop.js b/v2/internal/frontend/runtime/runtime_dev_desktop.js
diff --git a/v2/internal/frontend/runtime/runtime_prod_desktop.js b/v2/internal/frontend/runtime/runtime_prod_desktop.js