Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WinAppSDK upgrade time! (after .84 is verified stable) #34622

Merged
merged 8 commits into from
Sep 11, 2024

Conversation

crutkas
Copy link
Member

@crutkas crutkas commented Sep 5, 2024

Summary of the Pull Request

This upgrades to WinAppSDK 1.6, updates WebView2 and CsWinRT
Learnings from: #34437

We will also need Community Toolkit upgraded as well via #34419

PR Checklist

  • Closes: #xxx
  • Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
  • Tests: Added/updated and all pass
  • Localization: All end user facing strings can be localized
  • Dev docs: Added/updated
  • New binaries: Added on the required places
  • Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

@crutkas
Copy link
Member Author

crutkas commented Sep 5, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@crutkas
Copy link
Member Author

crutkas commented Sep 5, 2024

arm64 passed, x64 errored for some reason

Copy link
Collaborator

@jaimecbernardo jaimecbernardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Measure Tool isn't showing correctly.
image

Other than that, all seems to be working well. Good work!
Code changes LGTM!
I'll see if I can figure out what's wrong with Measure Tool.

@jaimecbernardo
Copy link
Collaborator

I've fixed MeasureToolUI to remove the title bar and borders that WASDK 1.6 seems to have added:
90f9e4f
image

Copy link
Collaborator

@jaimecbernardo jaimecbernardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

This comment has been minimized.

src/Common.Dotnet.CsWinRT.props Show resolved Hide resolved
@@ -56,6 +56,11 @@ public MainWindow(PowerToys.MeasureToolCore.Core core)
this.SetIsMaximizable(false);
IsTitleBarVisible = false;

// Remove the caption style from the window style. Windows App SDK 1.6 upgraded added it, which made the title bar and borders appear for Measure Tool. This code removes it.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a bug on their side?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be due to a change w/ 1.6 and the fact we use WinUIEx for that

Copy link
Collaborator

@davidegiacometti davidegiacometti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have done a quick sanity check across utilities/windows on W10.
It looks like the Settings Flyout requires the the same work-around applied to Screen Ruler.

image

#24907 needs also to be reverted since the tracked issue has been fixed in WASDK1.6

EDIT: happy to commit the required changes. Just let me know if the Flyout has the same issue on W11.

@crutkas
Copy link
Member Author

crutkas commented Sep 9, 2024

@davidegiacometti please submit fix!

@crutkas
Copy link
Member Author

crutkas commented Sep 9, 2024

alternative, could this be "good enough" and get it in and do a PR to fix this

Copy link
Collaborator

@davidegiacometti davidegiacometti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will fix the flyout in another PR. Feel free to merge.

@crutkas crutkas merged commit 883bd00 into main Sep 11, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants