Add Some WindowState #1349

zandercodes · 2022-04-24T13:52:42Z

~~Add Some WindowStates, States not tested.~~
Add WindowStates for

Is Fullscreen
Is Maximised
Is Minimised
Is Normal

Issue: #1348

leaanthony

Thanks for submitting this! There's a few questions I had and a couple of suggestions. Am scheduling this in for v2.1

v2/internal/frontend/desktop/darwin/WailsContext.h

v2/internal/frontend/desktop/linux/window.go

v2/internal/frontend/desktop/windows/win32/window.go

v2/pkg/runtime/window.go

leaanthony · 2022-04-27T20:32:56Z

Great stuff! Thanks for all this hard work. I'm wondering if, at the API level, we should have WindowGetState() that returns a WindowState type (int). It would cut the number of functions needed down quite significantly. We could use the IsWindow* methods behind the scenes to determine this. Thoughts?

zandercodes · 2022-04-28T06:51:36Z

That would be optimal for Windows. But I don't know how it is on macOS or Linux. I think it might be a possibility to offer this as a separate event as a callback when the state of the window changes.
I'll see what I can do :D

leaanthony · 2022-04-28T08:21:48Z

I think it should work on all platforms. Great idea on the events, just use the standard EventEmit call with "wails:window:maximised" etc. That's the convention 👍👍👍

leaanthony · 2022-04-28T09:29:48Z

Not sure why there's an emoji there. 🤣:wails:window:eventname 😂

zandercodes · 2022-05-02T08:57:09Z

@leaanthony I thought again and looked at Electron to understand how they map this case.
Electron itself also uses the native window state functions.
In the javascript, the resize event is accessed and the state is retrieved from the native functions.
So, the way I have this built in, I have done everything right and could be released that way. The only thing left to do, test it on macOS and Linux. Windows worked in my testing.

leaanthony · 2022-06-01T20:44:22Z

v2/internal/frontend/desktop/linux/window.go

@@ -766,6 +772,15 @@ func (w *Window) IsMaximised() bool {
 	return result > 0
 }

+func (w *Window) IsMinimised() bool {
+	result := C.IsMinimised(w.asGTKWidget())


Just wondering if this needs to be run on the main thread...

I have not tested this yet. I am currently testing this in an Ubuntu VM. Windows and macOS works fine.

Hey @zandercodes 👋 Just following up on the Linux testing. I can help with this if you need? It would be good to get this in!

I've gone through and resolved the conflict. This should be good but let me know if there are issues 👍

Hi @leaanthony, at the moment I don't have time to test this on Linux. But I will do it this week.

Thanks. I might be able to. Will update here

zandercodes · 2022-07-28T21:20:10Z

Small status update. Merge conflicts are complicated to resolve.
I will delete a the merge commits and edit my last commit so that the conflicts can be fixed.
Sorry, since I'm doing this free, I can't always take care of it.

…llscreen Solve conflicts # Conflicts: # v2/internal/frontend/desktop/darwin/WailsContext.m # v2/internal/frontend/desktop/darwin/frontend.go # v2/internal/frontend/desktop/linux/window.go # v2/internal/frontend/desktop/windows/window.go

…llscreen Solve conflict # Conflicts: # v2/pkg/runtime/window.go

# Conflicts: # v2/internal/frontend/desktop/darwin/WailsContext.h # v2/internal/frontend/desktop/windows/win32/consts.go # v2/internal/frontend/desktop/windows/win32/window.go

# Conflicts: # v2/internal/frontend/devserver/devserver.go

# Conflicts: # v2/internal/frontend/dispatcher/systemcalls.go # v2/internal/frontend/runtime/desktop/window.js # v2/internal/frontend/runtime/package-lock.json # v2/internal/frontend/runtime/runtime_prod_desktop.js # v2/internal/frontend/runtime/wrapper/runtime.d.ts # v2/internal/frontend/runtime/wrapper/runtime.js

# Conflicts: # v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js # v2/internal/frontend/runtime/package-lock.json # v2/internal/frontend/runtime/runtime_dev_desktop.js

leaanthony

I can't see any show stoppers so far 👍 Just the merge conflict characters that are checked in 👍

leaanthony · 2022-08-02T08:48:40Z

v2/internal/frontend/desktop/windows/win32/window.go

@@ -154,10 +193,35 @@ func getWindowLong(hwnd uintptr, index int) int32 {
 	return int32(ret)
 }

+<<<<<<< HEAD


Looks like this snuck in :-)

leaanthony · 2022-08-02T08:54:22Z

I can test on Linux 👍

zandercodes · 2022-08-02T09:30:47Z

I can test on Linux 👍

Yes, you can try, but i don´t know if it will work.

leaanthony · 2022-08-02T20:58:42Z

Tested on Linux. Worked fine apart from when the window is fullscreen, IsFullscreen() and IsMaximised() are true. Pushed a quick fix for that.

I used this for testing - thought it might be useful:

// Greet returns a greeting for the given name
func (a *App) Greet(name string) string {
	println("WindowIsFullscreen:", runtime.WindowIsFullscreen(a.ctx))
	println("WindowIsMaximised:", runtime.WindowIsMaximised(a.ctx))
	println("WindowIsMinimised:", runtime.WindowIsMinimised(a.ctx))
	println("WindowIsNormal:", runtime.WindowIsNormal(a.ctx))
	println("\n\n")
	return fmt.Sprintf("Hello %s, It's show time!", name)
}

and

window.WindowState = function() {
    WindowIsNormal().then((result) => {console.log("IsNormal: " + result);});
    WindowIsMinimised().then((result) => {console.log("IsMinimised: " + result);});
    WindowIsMaximised().then((result) => {console.log("IsMaximised: " + result);});
    WindowIsFullscreen().then((result) => {console.log("IsFullscreen: " + result);});
}

window.testGo = function() {
    WindowMinimise();
    setTimeout(() => {
        document.getElementsByTagName("button")[0].click();
        WindowUnminimise();
    }, 3000);
}

window.testJS = function() {
    WindowMinimise();
    setTimeout(() => {
        WindowState();
        WindowUnminimise();
    }, 3000);
}

zandercodes · 2022-08-03T07:47:13Z

Tested on Linux. Worked fine apart from when the window is fullscreen, IsFullscreen() and IsMaximised() are true. Pushed a quick fix for that.

I used this for testing - thought it might be useful:

// Greet returns a greeting for the given name
func (a *App) Greet(name string) string {
	println("WindowIsFullscreen:", runtime.WindowIsFullscreen(a.ctx))
	println("WindowIsMaximised:", runtime.WindowIsMaximised(a.ctx))
	println("WindowIsMinimised:", runtime.WindowIsMinimised(a.ctx))
	println("WindowIsNormal:", runtime.WindowIsNormal(a.ctx))
	println("\n\n")
	return fmt.Sprintf("Hello %s, It's show time!", name)
}

and

window.WindowState = function() {
    WindowIsNormal().then((result) => {console.log("IsNormal: " + result);});
    WindowIsMinimised().then((result) => {console.log("IsMinimised: " + result);});
    WindowIsMaximised().then((result) => {console.log("IsMaximised: " + result);});
    WindowIsFullscreen().then((result) => {console.log("IsFullscreen: " + result);});
}

window.testGo = function() {
    WindowMinimise();
    setTimeout(() => {
        document.getElementsByTagName("button")[0].click();
        WindowUnminimise();
    }, 3000);
}

window.testJS = function() {
    WindowMinimise();
    setTimeout(() => {
        WindowState();
        WindowUnminimise();
    }, 3000);
}

Thanks for testing and fixing :D

I'll finish the documentation for the website and then we can merge it.

leaanthony · 2022-08-03T08:09:28Z

Do you want to just double check with those test methods to be sure?

zandercodes · 2022-08-03T08:17:37Z

Do you want to just double check with those test methods to be sure?

Good idea. I will test it again on windows and macos. So that we are sure that they really work.

zandercodes · 2022-08-08T06:30:24Z

Do you want to just double check with those test methods to be sure?

Good idea. I will test it again on windows and macos. So that we are sure that they really work.

@leaanthony Works well on Windows and Mac

leaanthony · 2022-08-08T07:20:08Z

Nice. Just let us know when the docs are ready and mark it ready for review 👍

# Conflicts: # v2/internal/frontend/runtime/package-lock.json # v2/internal/frontend/runtime/runtime_prod_desktop.js # v2/internal/messagedispatcher/dispatchclient.go

leaanthony · 2022-08-23T10:54:55Z

If @stffabi has no objections with this, I think we can merge in pre v2.

leaanthony · 2022-08-29T20:51:51Z

Thanks for all your work on this! 🙏I did a quick update to the docs. Let's merge this and see how we go :-)

leaanthony requested changes Apr 25, 2022

View reviewed changes

zandercodes changed the title ~~Add Some WindowState~~ [WIP] Add Some WindowState Apr 25, 2022

zandercodes marked this pull request as draft April 26, 2022 13:41

zandercodes requested a review from leaanthony April 27, 2022 19:38

stffabi mentioned this pull request May 5, 2022

How to check app window is fullscreen #1379

Closed

leaanthony reviewed Jun 1, 2022

View reviewed changes

leaanthony mentioned this pull request Jul 9, 2022

[V2] [Windows, Linux] Resize cursors are shown when maximised #1503

Open

zandercodes added 6 commits August 2, 2022 10:26

Add Check for WindowState IsMaximised, IsMinimized, IsNormal and IsFu…

4960249

…llscreen Solve conflict # Conflicts: # v2/pkg/runtime/window.go

Forgot some function to use it

6093cc4

# Conflicts: # v2/internal/frontend/desktop/darwin/WailsContext.h # v2/internal/frontend/desktop/windows/win32/consts.go # v2/internal/frontend/desktop/windows/win32/window.go

Modify the instructions

c1ee3cd

# Conflicts: # v2/internal/frontend/devserver/devserver.go

Add Callback and JavaScript Functions

0b74e95

# Conflicts: # v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js # v2/internal/frontend/runtime/package-lock.json # v2/internal/frontend/runtime/runtime_dev_desktop.js

leaanthony reviewed Aug 2, 2022

View reviewed changes

zandercodes and others added 2 commits August 2, 2022 11:35

Remove Merge lines

2b8ac65

Fix IsMaximised

0e3ac02

zandercodes and others added 2 commits August 4, 2022 08:18

Merge branch 'master' into feature/v2-WindowState

7c817c6

Merge branch 'master' into feature/v2-WindowState

577e3d4

zandercodes added 3 commits August 8, 2022 13:14

Merge branch 'master' into feature/v2-WindowState

722fc94

Merge branch 'master' into feature/v2-WindowState

207a1f9

# Conflicts: # v2/internal/frontend/runtime/package-lock.json # v2/internal/frontend/runtime/runtime_prod_desktop.js # v2/internal/messagedispatcher/dispatchclient.go

Add WindowState Docs

8f5262c

zandercodes marked this pull request as ready for review August 22, 2022 07:28

zandercodes changed the title ~~[WIP] Add Some WindowState~~ Add Some WindowState Aug 22, 2022

leaanthony and others added 3 commits August 22, 2022 20:03

Merge branch 'master' into feature/v2-WindowState

6b67df1

Merge branch 'master' into feature/v2-WindowState

cb4872d

Merge branch 'master' into feature/v2-WindowState

a977e47

leaanthony enabled auto-merge (squash) August 23, 2022 10:55

leaanthony requested a review from stffabi August 23, 2022 10:55

zandercodes added 2 commits August 24, 2022 19:13

Merge branch 'master' into feature/v2-WindowState

93ba4d9

Merge branch 'master' into feature/v2-WindowState

e8e1351

auto-merge was automatically disabled August 29, 2022 13:45
Head branch was pushed to by a user without write access

Update docs

e009396

leaanthony merged commit 70c484f into wailsapp:master Aug 29, 2022

merlindru mentioned this pull request Dec 24, 2022

Tracking window state #2238

Open

coderabbitai bot mentioned this pull request Apr 22, 2024

docs: add guides ide change goland option and reference cli add options vscode or goland #3419

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Some WindowState #1349

Add Some WindowState #1349

zandercodes commented Apr 24, 2022 •

edited

Loading

leaanthony left a comment

leaanthony commented Apr 27, 2022

zandercodes commented Apr 28, 2022

leaanthony commented Apr 28, 2022

leaanthony commented Apr 28, 2022 •

edited

Loading

zandercodes commented May 2, 2022 •

edited

Loading

leaanthony Jun 1, 2022

zandercodes Jun 2, 2022 •

edited

Loading

leaanthony Jun 28, 2022

leaanthony Jun 28, 2022

zandercodes Jul 4, 2022

leaanthony Jul 4, 2022

zandercodes commented Jul 28, 2022

leaanthony left a comment

leaanthony Aug 2, 2022

zandercodes Aug 2, 2022

leaanthony commented Aug 2, 2022

zandercodes commented Aug 2, 2022

leaanthony commented Aug 2, 2022

zandercodes commented Aug 3, 2022 •

edited

Loading

leaanthony commented Aug 3, 2022 •

edited

Loading

zandercodes commented Aug 3, 2022

zandercodes commented Aug 8, 2022

leaanthony commented Aug 8, 2022

leaanthony commented Aug 23, 2022

leaanthony commented Aug 29, 2022

Add Some WindowState #1349

Add Some WindowState #1349

Conversation

zandercodes commented Apr 24, 2022 • edited Loading

leaanthony left a comment

Choose a reason for hiding this comment

leaanthony commented Apr 27, 2022

zandercodes commented Apr 28, 2022

leaanthony commented Apr 28, 2022

leaanthony commented Apr 28, 2022 • edited Loading

zandercodes commented May 2, 2022 • edited Loading

leaanthony Jun 1, 2022

Choose a reason for hiding this comment

zandercodes Jun 2, 2022 • edited Loading

Choose a reason for hiding this comment

leaanthony Jun 28, 2022

Choose a reason for hiding this comment

leaanthony Jun 28, 2022

Choose a reason for hiding this comment

zandercodes Jul 4, 2022

Choose a reason for hiding this comment

leaanthony Jul 4, 2022

Choose a reason for hiding this comment

zandercodes commented Jul 28, 2022

leaanthony left a comment

Choose a reason for hiding this comment

leaanthony Aug 2, 2022

Choose a reason for hiding this comment

zandercodes Aug 2, 2022

Choose a reason for hiding this comment

leaanthony commented Aug 2, 2022

zandercodes commented Aug 2, 2022

leaanthony commented Aug 2, 2022

zandercodes commented Aug 3, 2022 • edited Loading

leaanthony commented Aug 3, 2022 • edited Loading

zandercodes commented Aug 3, 2022

zandercodes commented Aug 8, 2022

leaanthony commented Aug 8, 2022

leaanthony commented Aug 23, 2022

leaanthony commented Aug 29, 2022

zandercodes commented Apr 24, 2022 •

edited

Loading

leaanthony commented Apr 28, 2022 •

edited

Loading

zandercodes commented May 2, 2022 •

edited

Loading

zandercodes Jun 2, 2022 •

edited

Loading

zandercodes commented Aug 3, 2022 •

edited

Loading

leaanthony commented Aug 3, 2022 •

edited

Loading