Update our SUI to follow win 11 guidelines by PankajBhojwani · Pull Request #11720 · microsoft/terminal

PankajBhojwani · 2021-11-09T22:49:44Z

Summary of the Pull Request

Updates our SUI to follow the windows 11 style guidelines. Includes updating our setting containers to follow the 'expander' style.

PR Checklist

Closes Deleting Profile Causes Odd Blue Bar Animation on Settings Page #10631
Closes Settings UI: bad spacing between pivot header and its content #9978
Closes Opening a new-tab after a split-pane causes two tab bars being highlighted #9595
Closes [UX] Adopt Windows 11 Fluent styling for Settings #11231
CLA signed. If not, go over here and sign the CLA
Tests added/passed
Documentation updated. If checked, please file a pull request on our docs repo and link it here: #xxx
Schema updated.
I work here

github-actions · 2021-11-09T22:52:59Z

@check-spelling-bot Report

Unrecognized words, please review:

ayy

Previously acknowledged words that are now absent

carlos dpg sid SPACEBAR Unregister Urxvt vcvarsall xIcon yIcon zamora

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the [email protected]:microsoft/terminal.git repository
on the dev/pabhoj/SUI_11 branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/expect/alphabet.txt
.github/actions/spelling/expect/expect.txt
.github/actions/spelling/expect/web.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spelling/expect/f9b97c4880f63af8d034234f4d23c24b8704f8a7.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/microsoft/terminal/issues/comments/964618191" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")
  

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. You can copy the contents of each perl command excluding the outer ' marks and dropping any '"/"' quotation mark pairs into a file and then run perl file.pl from the root of the repository to run the code. Alternatively, you can manually insert the items...

If the listed items are:

... misspelled, then please correct them instead of using the command.
... names, please add them to .github/actions/spelling/allow/names.txt.
... APIs, you can add them to a file in .github/actions/spelling/allow/.
... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

🗜️ If you see a bunch of garbage

If it relates to a ...

well-formed pattern

See if there's a pattern that would match it.

If not, try writing one and adding it to a patterns/{file}.txt.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.

binary-ish string

Please add a file path to the excludes.txt file instead of just accepting the garbage.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

PankajBhojwani · 2021-11-09T23:13:56Z

NOTE: This is slightly different from the settings app in the following manner - when you hover over our expanders, only the chevron/arrow gets highlighted, whereas when you hover over the expanders in the settings app, the entire control gets highlighted. We know about this difference and are sticking with our implementation because the settings app implemented its own version of an 'expander' that is actually a toggle button + a border instead of using the built-in xaml expander, which is what we are using. Here's the difference in GIFs:

Ours:

Settings app:

carlos-zamora

It's annoying that the mux expander is different from the Settings App one, but this is a good start. :)

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

carlos-zamora · 2021-11-10T18:30:02Z

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

+    <Style x:Key="NonExpanderGrid"
+           TargetType="Grid">


Is there anything we can set the BasedOn property too? That way, if any changes happen upstream, we'll just get them for free.

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

tropicaaal · 2021-11-12T16:25:34Z

I personally agree that the default expander style should be kept, as settings is the only inbox app that uses those. Other inbox apps such as Calculator, Clock and Snipping Tool all use the default expander style in their settings.

Shomnipotence · 2021-11-15T16:19:19Z

A Design for two level navigation

If you just want only one level navigation，the Icons Only is a better choose。

Shomnipotence · 2021-11-15T16:22:15Z

for the button bar ，the in-app-acrylic is a good way to show the content in the background

LasseRosenow · 2021-12-03T02:46:53Z

I was wondering: Why have those boxes with rounded corners?

The windows 11 settings app does not have any boxes. The navigation and the pages share the same background.

@Tropix126 already created a design concept that looks much more consistent to the windows 11 settings:

#11231 (comment)

tropicaaal · 2021-12-08T19:33:57Z

The windows 11 settings app does not have any boxes. The navigation and the pages share the same background.

This is just due to the default styling added by WinUI, it can be overrided fairly easily if they want to do that.

One thing that I might suggest if you guys make the settings panel flush with the app, is to also modify the tabs to be semitransparent so they line up as a single apparent surface. I imagine this will also depend on how mica is handled throughout the titlebar too, though.

zadjii-msft · 2022-01-21T15:33:19Z

The rename button in the schemes page cuts off half the icon now...?
Curiously, the rest of the icons throughout the UI are still using Segoe MDL2, instead of Segoe Fluent. We may need to manually update the font name where we're using it manually...

zadjii-msft

meh, I'm pretty much good with this. Let's merge and keep working on the rest of the polish for 1.12

zadjii-msft · 2021-11-10T14:14:11Z

src/cascadia/TerminalApp/App.xaml

            <ResourceDictionary.MergedDictionaries>
                <!--  Include the MUX Controls resources  -->
                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
-                                       ControlsResourcesVersion="Version1" />


this is going to also change the appearance of the tabs, of the command palette, the find dialog, the content dialogs, the toasts - everything.

This almost deserves it's own PR to make sure everything besides the SUI still looks & works right

src/cascadia/TerminalSettingsEditor/Profiles.xaml

PankajBhojwani · 2022-01-25T21:54:23Z

Undrafting this so we can get this in, the actions page and color schemes page will be done in post

miniksa · 2022-01-27T17:43:51Z

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

    <Style TargetType="local:SettingContainer">
-        <Setter Property="Margin" Value="0,24,0,0" />
        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="MaxWidth" Value="1000" />


Is 1000 enough for super high resolution screens with the window maximized?

I'm sure this value is in DIPs, So that should be 3000px at 300% scaling and thus fine.

miniksa · 2022-01-27T17:45:35Z

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

+                        </Grid>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">


My brain has exploded at these animation declarations. My hope is that you were able to just steal these from somewhere and not have to figure all this out yourself. Sheesh!

Yeah I got them from the xaml github (yay open source 👍)

…p text

zadjii-msft · 2022-01-27T20:11:15Z

I'm not automerging this because it'll blow up the stacked changes IIRC

…shorter

DHowett

i love this, and you did a great job pulling it together

Turns out, this bug only repros in Controls version 2. I'm not sure why, but it didn't repro only on main. So this fix does nothing until #11720 merges. This PR prevents us from setting properties on the paste warning dialog unless we actually need to paste. 5f9c551 proves that settings these properties is what would cause the bug in the first place. I went a step further and cleaned this up a bit. This was always a little weird, having to get the `BracketedPasteEnabled` for the active control on the UI thread before we actually display the warning. In the post-#5000 future where going back to the control like this would be a x-proc hop, I figured I should just skip that entirely and plumb the `BracketedPaste` state out in the initial request. * [x] Closes #12202 * [x] I work here * [x] No tests, but there's not a great place for a test like this * [x] Doesn't affect docs See also: #12241 which would introduce #12202 on its own.

## Summary of the Pull Request **Note: This PR targets #11720** Replaces our old pivot-style settings UI with a breadcrumb bar style, as per the windows 11 style guidelines. This required splitting `Profiles.xaml` into 3 separate files, `Profiles_Base.xaml` for general settings, `Profiles_Appearance.xaml` for appearance settings, `Profiles_Advanced.xaml` for advanced settings The header in the navigation view is now a [BreadcrumbBar](https://docs.microsoft.com/en-us/windows/apps/design/controls/breadcrumbbar), which can be used to navigate back to `Profiles_Base` after moving into the advanced or appearance page (see GIF below)  ## PR Checklist * [ ] Closes #xxx * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [x] I work here ## Validation Steps Performed ![breadcrumb](https://user-images.githubusercontent.com/26824113/150410517-2232811e-4f5b-4732-9a0d-569cc94093b3.gif)

Updates our SUI to follow the windows 11 style guidelines. Includes updating our setting containers to follow the 'expander' style. * [x] Closes #10631 * [x] Closes #9978 * [x] Closes #9595 * [x] Closes #11231 * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [x] I work here

**Note: This PR targets #11720** Replaces our old pivot-style settings UI with a breadcrumb bar style, as per the windows 11 style guidelines. This required splitting `Profiles.xaml` into 3 separate files, `Profiles_Base.xaml` for general settings, `Profiles_Appearance.xaml` for appearance settings, `Profiles_Advanced.xaml` for advanced settings The header in the navigation view is now a [BreadcrumbBar](https://docs.microsoft.com/en-us/windows/apps/design/controls/breadcrumbbar), which can be used to navigate back to `Profiles_Base` after moving into the advanced or appearance page (see GIF below)  * [ ] Closes #xxx * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [x] I work here ![breadcrumb](https://user-images.githubusercontent.com/26824113/150410517-2232811e-4f5b-4732-9a0d-569cc94093b3.gif)

PankajBhojwani added 4 commits November 2, 2021 10:59

testing

0b58355

got 2 styles that kinda work I guess

ba4faec

apparently this is the old expander

f3fd857

just use muxc:expander

13bbcbf

remove remnants of previous implementation, format

81d0c5c

floh96 mentioned this pull request Nov 10, 2021

[UX] Adopt Windows 11 Fluent styling for Settings #11231

Closed

carlos-zamora reviewed Nov 10, 2021

View reviewed changes

carlos comments

61ae0a1

tropicaaal mentioned this pull request Nov 12, 2021

MEGA THREAD: Design still subject to change, UI is pretty okay though #1375

Closed

29 tasks

PankajBhojwani mentioned this pull request Jan 12, 2022

Add a BreadcrumbBar to the SUI #12144

Merged

6 tasks

PankajBhojwani added 2 commits January 12, 2022 10:29

merge main

e6dffda

format

de8a869

zadjii-msft mentioned this pull request Jan 20, 2022

Don't open a hole in the terminal window when pasting #12208

Merged

4 tasks

PankajBhojwani added 2 commits January 20, 2022 10:28

left align actions

26652fe

add more margin for scroll bar

cefa906

zadjii-msft mentioned this pull request Jan 20, 2022

Opening a new-tab after a split-pane causes two tab bars being highlighted #9595

Closed

zadjii-msft linked an issue Jan 20, 2022 that may be closed by this pull request

Opening a new-tab after a split-pane causes two tab bars being highlighted #9595

Closed

PankajBhojwani added 2 commits January 20, 2022 14:50

vertically center settings without help text

79daeed

fix long text messing up setting container

103d661

zadjii-msft linked an issue Jan 21, 2022 that may be closed by this pull request

Deleting Profile Causes Odd Blue Bar Animation on Settings Page #10631

Closed

zadjii-msft mentioned this pull request Jan 21, 2022

Deleting Profile Causes Odd Blue Bar Animation on Settings Page #10631

Closed

zadjii-msft approved these changes Jan 21, 2022

View reviewed changes

PankajBhojwani marked this pull request as ready for review January 25, 2022 21:54

conflict

f0f33c1

zadjii-msft added the Needs-Second It's a PR that needs another sign-off label Jan 26, 2022

ghost requested review from leonMSFT, lhecker and miniksa January 26, 2022 12:21

zadjii-msft mentioned this pull request Jan 26, 2022

Add Elevate flag to the SUI #12257

Merged

2 tasks

PankajBhojwani added 2 commits January 26, 2022 13:57

max width

57f61dc

fix help text block width

aa7a95b

zadjii-msft mentioned this pull request Jan 27, 2022

Bottom part of SUI has a giant black bar on it #12271

Closed

miniksa approved these changes Jan 27, 2022

View reviewed changes

PankajBhojwani changed the title ~~SUI rejuvenation [WORK IN PROGRESS]~~ SUI rejuvenation Jan 27, 2022

PankajBhojwani changed the title ~~SUI rejuvenation~~ Update our SUI to follow win 11 guidelines Jan 27, 2022

PankajBhojwani added 2 commits January 27, 2022 10:47

combine rows and cols into one expander, still need to figure out hel…

6b032fd

…p text

conflict

a0b2fa1

PankajBhojwani added 2 commits January 27, 2022 14:19

helptext for rows/cols

b192007

footer background now matches content background, footer is slightly …

e93bc82

…shorter

DHowett approved these changes Jan 27, 2022

View reviewed changes

fix launch size

aab33ef

PankajBhojwani merged commit 35504f4 into main Jan 28, 2022

PankajBhojwani deleted the dev/pabhoj/SUI_11 branch January 28, 2022 00:43

mailinglists35 mentioned this pull request Feb 6, 2022

Update changed tab colors so I can no longer figure out which one is active 🤬 #12398

Closed

zadjii-msft mentioned this pull request Feb 7, 2022

UI nits from WinUI Controlsv2 #12400

Open

12 tasks

zadjii-msft mentioned this pull request Mar 15, 2022

Merge the Windows 11 styles into 1.12 #12696

Merged

Conversation

PankajBhojwani commented Nov 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

PR Checklist

Uh oh!

github-actions bot commented Nov 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

@check-spelling-bot Report

Unrecognized words, please review:

Uh oh!

PankajBhojwani commented Nov 9, 2021

Uh oh!

carlos-zamora left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

carlos-zamora Nov 10, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tropicaaal commented Nov 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Shomnipotence commented Nov 15, 2021

Uh oh!

Shomnipotence commented Nov 15, 2021

Uh oh!

LasseRosenow commented Dec 3, 2021

Uh oh!

tropicaaal commented Dec 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zadjii-msft commented Jan 21, 2022

Uh oh!

zadjii-msft left a comment

Choose a reason for hiding this comment

Uh oh!

zadjii-msft Nov 10, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

PankajBhojwani commented Jan 25, 2022

Uh oh!

miniksa Jan 27, 2022

Choose a reason for hiding this comment

Uh oh!

lhecker Jan 27, 2022

Choose a reason for hiding this comment

Uh oh!

miniksa Jan 27, 2022

Choose a reason for hiding this comment

Uh oh!

miniksa Jan 27, 2022

Choose a reason for hiding this comment

Uh oh!

PankajBhojwani Jan 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zadjii-msft commented Jan 27, 2022

Uh oh!

DHowett left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

PankajBhojwani commented Nov 9, 2021 •

edited

Loading

github-actions bot commented Nov 9, 2021 •

edited

Loading

tropicaaal commented Nov 12, 2021 •

edited

Loading

tropicaaal commented Dec 8, 2021 •

edited

Loading

PankajBhojwani Jan 27, 2022 •

edited

Loading