[v3] Fix ordering of if branches in WebviewWindow.Restore method by fbbdev · Pull Request #3279 · wailsapp/wails

fbbdev · 2024-02-27T00:32:56Z

Description

The Window.Restore method currently checks first whether the window is maximised, in which case it calls UnMaximise and returns, otherwise it proceeds to check whether it is in fullscreen mode or minimised.

This behaviour is both buggy and conceptually wrong:

conceptually, it is possible for a window to be both maximised and in fullscreen mode, and typically fullscreen mode will have been entered after the window was maximised, hence the intuitive behaviour is to exit fullscreen first;
practically, this results in a bug on macOS where restore does nothing in fullscreen mode, as it seems that the macOS windowing backend treats all fullscreen windows as also maximised.

Swapping the order of the branches fixes the problem on macOS.

To reproduce (on macOS):

clone the PR branch,
checkout the second-last commit (git checkout 3020b0a2f08),
run the new window-api example,
click the 'Fullscreen' button, then the 'Restore' button: nothing will happen.

Type of change

Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

I created the window-api example and used it to test most relevant combinations (maximise-then-restore, fullscreen-then-restore). I have not tested minimise-then-restore.

Windows
macOS
Linux

Test Configuration

Wails CLI      | v3.0.0-alpha.3                                                                
Go Version     | go1.22.0                                                                      
Revision       | 12d12a33dec1d31f487b70f87bc31e80252f327c                                      
Modified       | true                                                                          
-buildmode     | exe                                                                           
-compiler      | gc                                                                            
CGO_CFLAGS     |                                                                               
CGO_CPPFLAGS   |                                                                               
CGO_CXXFLAGS   |                                                                               
CGO_ENABLED    | 1                                                                             
CGO_LDFLAGS    |                                                                               
DefaultGODEBUG | httplaxcontentlength=1,httpmuxgo121=1,tls10server=1,tlsrsakex=1,tlsunsafeekm=1
GOAMD64        | v1                                                                            
GOARCH         | amd64                                                                         
GOOS           | darwin                                                                        
vcs            | git                                                                           
vcs.modified   | true                                                                          
vcs.revision   | 12d12a33dec1d31f487b70f87bc31e80252f327c                                      
vcs.time       | 2024-02-21T12:40:32Z                                                          

# System
Name            | MacOS                                   
Version         | 12.6.6                                  
ID              | 21G646                                  
Branding        | Monterey                                
Platform        | darwin                                  
Architecture    | amd64                                   
Apple Silicon   | unknown                                 
CPU             | Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
Xcode cli tools | 2395                                    
CPU             | Unknown                                 
GPU             | Unknown                                 
Memory          | Unknown                                 

# Diagnosis
 SUCCESS  Your system is ready for Wails development!

Checklist:

I have updated mkdocs-website/docs/en/changelog.md with details of this PR
My code follows the general coding style of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation (N/A)
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes

coderabbitai · 2024-02-27T00:33:01Z

Important

Auto Review Skipped

Auto reviews are disabled on base/target branches other than the default branch. Please add the base/target branch pattern to the list of additional branches to be reviewed in the settings.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit-tests for this file.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit tests for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository from git and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit tests.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
The JSON schema for the configuration file is available here.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

leaanthony · 2024-02-28T21:40:57Z

Not sure if I'm doing something wrong here but clicking restore when in fullscreen doesn't unfullscreen it... I wonder what I'm doing wrong 🤔

fbbdev · 2024-02-28T22:07:44Z

I am gonna clone the branch and test it again from a clean slate, let's see what happens

fbbdev · 2024-03-01T01:21:39Z

I've done the tests, here's what I see:

repo at fix-restore, working tree clean, working dir is v3
git checkout 3020b0a2f085cd
go clean . && go clean -cache
cd examples/window-api
go run . –> long build time –> the restore button does nothing in fullscreen
git checkout fix-restore
go run . –> short build time –> the restore button still does nothing in fullscreen
cd ../.. && go clean . && go clean -cache
cd examples/window-api
go run . –> long build time –> the restore button now works in fullscreen

Looks like the go build system is failing to pick up the changes 🤔

leaanthony · 2024-03-02T04:55:25Z

Looks like the go build system is failing to pick up the changes 🤔

Oh that suuuucks!

leaanthony · 2024-03-02T05:04:22Z

Yup! That worked great. Thank you!! 🙏

…lsapp#3279) * Add JS Window API example * Fix ordering of if branches in Window.Restore method * Add changelog entry

fbbdev added 2 commits February 27, 2024 00:55

Add JS Window API example

3020b0a

Fix ordering of if branches in Window.Restore method

93be585

fbbdev mentioned this pull request Feb 27, 2024

[v3] Export Window.UnFullscreen method from JS runtime module #3280

Closed

12 tasks

Add changelog entry

b0cfc08

fbbdev changed the title ~~[v3] Fix ordering of if branches in Window.Restore method~~ [v3] Fix ordering of if branches in WebviewWindow.Restore method Feb 28, 2024

Merge branch 'v3-alpha' into fix-restore

f8b5cbe

leaanthony self-requested a review March 2, 2024 04:56

leaanthony merged commit 0c3025d into wailsapp:v3-alpha Mar 2, 2024

fbbdev deleted the fix-restore branch March 2, 2024 08:22

AkshayKalose mentioned this pull request Jan 3, 2025

[v3] Update Templates (macOS Target Version and Linux aarch64 AppImage) #3981

Merged

github-actions Bot mentioned this pull request Jul 13, 2025

[V3] fix: enhance doctor command to verify Windows SDK dependencies #4392

Merged

15 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[v3] Fix ordering of if branches in WebviewWindow.Restore method#3279

[v3] Fix ordering of if branches in WebviewWindow.Restore method#3279
leaanthony merged 4 commits into
wailsapp:v3-alphafrom
fbbdev:fix-restore

fbbdev commented Feb 27, 2024 •

edited

Loading

Uh oh!

coderabbitai Bot commented Feb 27, 2024

Auto Review Skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

CodeRabbit Discord Community

Uh oh!

leaanthony commented Feb 28, 2024

Uh oh!

fbbdev commented Feb 28, 2024

Uh oh!

fbbdev commented Mar 1, 2024 •

edited

Loading

Uh oh!

leaanthony commented Mar 2, 2024

Uh oh!

leaanthony commented Mar 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

fbbdev commented Feb 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

How Has This Been Tested?

Test Configuration

Checklist:

Uh oh!

coderabbitai Bot commented Feb 27, 2024

Auto Review Skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

CodeRabbit Discord Community

Uh oh!

leaanthony commented Feb 28, 2024

Uh oh!

fbbdev commented Feb 28, 2024

Uh oh!

fbbdev commented Mar 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leaanthony commented Mar 2, 2024

Uh oh!

leaanthony commented Mar 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fbbdev commented Feb 27, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)

fbbdev commented Mar 1, 2024 •

edited

Loading