2020-12-11 22:34:21 +01:00
|
|
|
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
|
|
|
|
the MIT License. See LICENSE in the project root for license information. -->
|
|
|
|
<Page
|
|
|
|
x:Class="Microsoft.Terminal.Settings.Editor.Profiles"
|
|
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
|
xmlns:local="using:Microsoft.Terminal.Settings.Editor"
|
|
|
|
xmlns:model="using:Microsoft.Terminal.Settings.Model"
|
|
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
|
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
|
|
|
mc:Ignorable="d">
|
|
|
|
|
|
|
|
<Page.Resources>
|
|
|
|
<ResourceDictionary>
|
|
|
|
<ResourceDictionary.MergedDictionaries>
|
|
|
|
<ResourceDictionary Source="CommonResources.xaml"/>
|
|
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
|
|
|
|
<DataTemplate x:DataType="local:EnumEntry" x:Key="EnumRadioButtonTemplate">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<RadioButton Content="{x:Bind EnumName, Mode=OneWay}"/>
|
2020-12-11 22:34:21 +01:00
|
|
|
</DataTemplate>
|
|
|
|
|
|
|
|
<DataTemplate x:DataType="local:EnumEntry" x:Key="EnumComboBoxItemTemplate">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<TextBlock Text="{x:Bind EnumName, Mode=OneWay}"/>
|
2020-12-11 22:34:21 +01:00
|
|
|
</DataTemplate>
|
|
|
|
|
2021-03-08 17:45:12 +01:00
|
|
|
<DataTemplate x:DataType="local:Font" x:Key="FontFaceComboBoxItemTemplate">
|
|
|
|
<TextBlock Text="{x:Bind LocalizedName}" FontFamily="{x:Bind Name}"/>
|
|
|
|
</DataTemplate>
|
|
|
|
|
2020-12-11 22:34:21 +01:00
|
|
|
<local:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
|
|
|
|
<local:PercentageConverter x:Key="PercentageConverter"/>
|
|
|
|
<local:FontWeightConverter x:Key="FontWeightConverter"/>
|
2020-12-18 00:14:07 +01:00
|
|
|
<local:InvertedBooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter"/>
|
2021-01-18 23:34:07 +01:00
|
|
|
<local:StringIsEmptyConverter x:Key="StringIsEmptyConverter"/>
|
2021-01-26 03:22:24 +01:00
|
|
|
<local:PaddingConverter x:Key="PaddingConverter"/>
|
2021-01-18 23:34:07 +01:00
|
|
|
<local:StringIsNotDesktopConverter x:Key="StringIsNotDesktopConverter"/>
|
|
|
|
<local:DesktopWallpaperToEmptyStringConverter x:Key="DesktopWallpaperToEmptyStringConverter"/>
|
|
|
|
|
2020-12-11 22:34:21 +01:00
|
|
|
</ResourceDictionary>
|
|
|
|
</Page.Resources>
|
|
|
|
|
2020-12-18 00:14:07 +01:00
|
|
|
<!--Use a Grid instead of a StackPanel. StackPanel suppresses the inner ScrollViewer.-->
|
2020-12-24 01:22:18 +01:00
|
|
|
<Grid>
|
2020-12-18 00:14:07 +01:00
|
|
|
<Grid.RowDefinitions>
|
|
|
|
<RowDefinition Height="auto"/>
|
|
|
|
<RowDefinition Height="*"/>
|
|
|
|
</Grid.RowDefinitions>
|
2021-01-13 01:13:28 +01:00
|
|
|
|
2020-12-18 00:14:07 +01:00
|
|
|
<TextBlock x:Uid="Profile_BaseLayerDisclaimer"
|
|
|
|
Grid.Row="0"
|
2020-12-24 01:22:18 +01:00
|
|
|
Margin="{StaticResource StandardIndentMargin}"
|
2020-12-18 00:14:07 +01:00
|
|
|
Style="{StaticResource DisclaimerStyle}"
|
|
|
|
Visibility="{x:Bind State.Profile.IsBaseLayer}"/>
|
|
|
|
|
2021-01-26 00:06:33 +01:00
|
|
|
<Pivot x:Name="ProfilesPivot"
|
|
|
|
HorizontalAlignment="Left"
|
2020-12-24 01:22:18 +01:00
|
|
|
Grid.Row="1"
|
2021-01-26 00:06:33 +01:00
|
|
|
SelectionChanged="Pivot_SelectionChanged"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
Margin="1,0,0,0">
|
2020-12-18 00:14:07 +01:00
|
|
|
<!-- General Tab -->
|
|
|
|
<PivotItem x:Uid="Profile_General">
|
|
|
|
<ScrollViewer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
2021-02-08 19:04:43 +01:00
|
|
|
|
2021-01-23 00:43:54 +01:00
|
|
|
<!--Name-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<!--NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
|
|
|
|
Additionally, the JSON stubs generated by auto-generated profiles come with a name,
|
|
|
|
so the name will always be overridden.-->
|
|
|
|
<local:SettingContainer x:Uid="Profile_Name"
|
|
|
|
Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
|
|
|
|
Margin="0,0,0,24">
|
|
|
|
<TextBox Text="{x:Bind State.Profile.Name, Mode=TwoWay}"
|
2021-01-23 00:43:54 +01:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2021-01-23 00:43:54 +01:00
|
|
|
|
2020-12-18 00:14:07 +01:00
|
|
|
<!--Commandline-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Commandline"
|
|
|
|
x:Name="CommandlineContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
|
|
|
|
Margin="0,0,0,24">
|
2020-12-18 00:14:07 +01:00
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBox Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
|
|
|
<Button x:Uid="Profile_CommandlineBrowse"
|
|
|
|
Click="Commandline_Click"
|
|
|
|
Style="{StaticResource BrowseButtonStyle}"/>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Starting Directory-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_StartingDirectory"
|
|
|
|
x:Name="StartingDirectoryContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
2021-01-14 20:06:10 +01:00
|
|
|
<StackPanel Orientation="Vertical">
|
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBox Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}"
|
|
|
|
IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
|
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
2021-01-14 20:06:10 +01:00
|
|
|
<Button x:Uid="Profile_StartingDirectoryBrowse"
|
2021-02-08 19:04:43 +01:00
|
|
|
x:Name="StartingDirectoryBrowse"
|
|
|
|
Click="StartingDirectory_Click"
|
|
|
|
IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
|
|
|
|
Style="{StaticResource BrowseButtonStyle}"/>
|
2021-01-14 20:06:10 +01:00
|
|
|
</StackPanel>
|
|
|
|
<CheckBox x:Uid="Profile_StartingDirectoryUseParentCheckbox"
|
2021-02-08 19:04:43 +01:00
|
|
|
x:Name="StartingDirectoryUseParentCheckbox"
|
|
|
|
IsChecked="{x:Bind State.Profile.UseParentProcessDirectory, Mode=TwoWay}"/>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Icon-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Icon"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}">
|
2020-12-18 00:14:07 +01:00
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBox Text="{x:Bind State.Profile.Icon, Mode=TwoWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
FontFamily="Segoe UI, Segoe MDL2 Assets"
|
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
|
|
|
<Button x:Uid="Profile_IconBrowse"
|
|
|
|
Click="Icon_Click"
|
|
|
|
Style="{StaticResource BrowseButtonStyle}"/>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Tab Title-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_TabTitle"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBox Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}"
|
2020-12-11 22:34:21 +01:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Hidden-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Hidden"
|
|
|
|
Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
|
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.Hidden, Mode=TwoWay}"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Delete Button-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<StackPanel Margin="{StaticResource StandardControlMargin}">
|
|
|
|
<Button x:Name="DeleteButton"
|
|
|
|
IsEnabled="{x:Bind State.Profile.CanDeleteProfile}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
Style="{StaticResource DeleteButtonStyle}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<Button.Resources>
|
|
|
|
<ResourceDictionary>
|
|
|
|
<ResourceDictionary.ThemeDictionaries>
|
|
|
|
<ResourceDictionary x:Key="Light">
|
|
|
|
<SolidColorBrush x:Key="ButtonBackground" Color="Firebrick"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#C23232"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#A21212"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForeground" Color="White"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPressed" Color="White"/>
|
|
|
|
</ResourceDictionary>
|
|
|
|
<ResourceDictionary x:Key="Dark">
|
|
|
|
<SolidColorBrush x:Key="ButtonBackground" Color="Firebrick"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#C23232"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#A21212"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForeground" Color="White"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPressed" Color="White"/>
|
|
|
|
</ResourceDictionary>
|
|
|
|
<ResourceDictionary x:Key="HighContrast">
|
|
|
|
<SolidColorBrush x:Key="ButtonBackground" Color="{ThemeResource SystemColorButtonFaceColor}"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForeground" Color="{ThemeResource SystemColorButtonTextColor}"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonForegroundPressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
|
|
|
|
</ResourceDictionary>
|
|
|
|
</ResourceDictionary.ThemeDictionaries>
|
|
|
|
</ResourceDictionary>
|
|
|
|
</Button.Resources>
|
|
|
|
<Button.Content>
|
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
|
<FontIcon Glyph=""
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
FontSize="{StaticResource StandardIconSize}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBlock x:Uid="Profile_DeleteButton"
|
2020-12-18 00:14:07 +01:00
|
|
|
Margin="10,0,0,0"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</StackPanel>
|
|
|
|
</Button.Content>
|
|
|
|
<Button.Flyout>
|
|
|
|
<Flyout>
|
|
|
|
<StackPanel>
|
|
|
|
<TextBlock x:Uid="Profile_DeleteConfirmationMessage"
|
2020-12-18 00:14:07 +01:00
|
|
|
Style="{StaticResource CustomFlyoutTextStyle}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
<Button x:Uid="Profile_DeleteConfirmationButton"
|
2020-12-18 00:14:07 +01:00
|
|
|
Click="DeleteConfirmation_Click"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</StackPanel>
|
|
|
|
</Flyout>
|
|
|
|
</Button.Flyout>
|
|
|
|
</Button>
|
|
|
|
<TextBlock x:Name="DeleteButtonDisclaimer"
|
2020-12-18 00:14:07 +01:00
|
|
|
Style="{StaticResource DisclaimerStyle}"
|
|
|
|
VerticalAlignment="Center"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
|
|
|
</ScrollViewer>
|
|
|
|
</PivotItem>
|
|
|
|
|
|
|
|
<!-- Appearance Tab -->
|
|
|
|
<PivotItem x:Uid="Profile_Appearance">
|
|
|
|
<ScrollViewer>
|
|
|
|
<StackPanel>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
|
|
|
<!--Grouping: Text-->
|
|
|
|
<TextBlock x:Uid="Profile_TextHeader" Style="{StaticResource SubtitleTextBlockStyle}"/>
|
|
|
|
|
|
|
|
<!--Color Scheme-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_ColorScheme"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasColorSchemeName, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearColorSchemeName}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.ColorSchemeNameOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
|
|
|
<ComboBox ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentColorScheme, Mode=TwoWay}"
|
|
|
|
Style="{StaticResource ComboBoxSettingStyle}">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<ComboBox.ItemTemplate>
|
|
|
|
<DataTemplate x:DataType="model:ColorScheme">
|
|
|
|
<TextBlock Text="{x:Bind Name, Mode=OneWay}"/>
|
|
|
|
</DataTemplate>
|
|
|
|
</ComboBox.ItemTemplate>
|
|
|
|
</ComboBox>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
|
|
|
|
<!--Font Face-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_FontFace"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasFontFace, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearFontFace}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.FontFaceOverrideSource, Mode=OneWay}">
|
2021-03-08 17:45:12 +01:00
|
|
|
<StackPanel>
|
|
|
|
<!--Binding the ItemsSource to a separate variable that switches between the
|
|
|
|
two font lists causes a crash within the ComboBox code.
|
|
|
|
As a workaround, introduce two ComboBox controls and only display one at a time.-->
|
|
|
|
<ComboBox ItemsSource="{x:Bind State.Profile.MonospaceFontList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentFontFace, Mode=OneWay}"
|
|
|
|
SelectionChanged="FontFace_SelectionChanged"
|
|
|
|
Style="{StaticResource ComboBoxSettingStyle}"
|
|
|
|
ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
|
|
|
|
Visibility="{x:Bind State.Profile.ShowAllFonts, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
|
|
|
|
<ComboBox ItemsSource="{x:Bind State.Profile.CompleteFontList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentFontFace, Mode=OneWay}"
|
|
|
|
SelectionChanged="FontFace_SelectionChanged"
|
|
|
|
Style="{StaticResource ComboBoxSettingStyle}"
|
|
|
|
ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
|
|
|
|
Visibility="{x:Bind State.Profile.ShowAllFonts, Mode=OneWay}"/>
|
|
|
|
<CheckBox x:Uid="Profile_FontFaceShowAllFonts"
|
|
|
|
x:Name="ShowAllFontsCheckbox"
|
|
|
|
IsChecked="{x:Bind State.Profile.ShowAllFonts, Mode=TwoWay}"
|
|
|
|
IsEnabled="{x:Bind State.Profile.UsingMonospaceFont, Mode=OneWay}"/>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Font Size-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_FontSize"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasFontSize, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearFontSize}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.FontSizeOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:NumberBox Value="{x:Bind State.Profile.FontSize, Mode=TwoWay}"
|
|
|
|
Style="{StaticResource NumberBoxSettingStyle}"
|
|
|
|
AcceptsExpression="False"
|
|
|
|
Minimum="1"
|
|
|
|
Maximum="128"
|
|
|
|
SmallChange="1"
|
|
|
|
LargeChange="10"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Font Weight-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_FontWeight"
|
|
|
|
x:Name="FontWeightContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasFontWeight, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearFontWeight}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.FontWeightOverrideSource, Mode=OneWay}">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
<ComboBox x:Name="FontWeightComboBox"
|
|
|
|
ItemsSource="{x:Bind FontWeightList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentFontWeight, Mode=TwoWay}"
|
|
|
|
ItemTemplate="{StaticResource EnumComboBoxItemTemplate}"
|
|
|
|
Style="{StaticResource ComboBoxSettingStyle}"/>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Custom Font Weight Control-->
|
|
|
|
<Grid Margin="0,10,0,0"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind IsCustomFontWeight, Mode=OneWay}"
|
|
|
|
Style="{StaticResource CustomSliderControlGridStyle}">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Slider x:Name="FontWeightSlider"
|
2021-02-08 19:04:43 +01:00
|
|
|
Grid.Column="0"
|
|
|
|
Minimum="0" Maximum="1000"
|
|
|
|
TickFrequency="50" TickPlacement="Outside"
|
|
|
|
Value="{x:Bind State.Profile.FontWeight,
|
|
|
|
Converter={StaticResource FontWeightConverter},
|
|
|
|
Mode=TwoWay}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<TextBlock Grid.Column="1"
|
2021-02-08 19:04:43 +01:00
|
|
|
Text="{Binding ElementName=FontWeightSlider, Path=Value, Mode=OneWay}"
|
|
|
|
Style="{StaticResource SliderValueLabelStyle}"
|
|
|
|
Margin="10,0,0,0"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</Grid>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Retro Terminal Effect-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasRetroTerminalEffect, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearRetroTerminalEffect}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.RetroTerminalEffectOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.RetroTerminalEffect, Mode=TwoWay}"/>
|
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Grouping: Cursor-->
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
|
|
|
<TextBlock x:Uid="Profile_CursorHeader" Style="{StaticResource SubtitleTextBlockStyle}"/>
|
|
|
|
|
|
|
|
<!--Cursor Shape-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_CursorShape"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCursorShape, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCursorShape}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CursorShapeOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind CursorShapeList, Mode=OneWay}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
SelectedItem="{x:Bind CurrentCursorShape, Mode=TwoWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
|
|
|
|
<!--Cursor Height-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_CursorHeight"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCursorHeight, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCursorHeight}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CursorHeightOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
|
|
|
|
<muxc:NumberBox Value="{x:Bind State.Profile.CursorHeight, Mode=TwoWay}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
Style="{StaticResource NumberBoxSettingStyle}"
|
2021-03-04 18:47:23 +01:00
|
|
|
Minimum="1"
|
|
|
|
Maximum="100"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
SmallChange="1"
|
|
|
|
LargeChange="10"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Grouping: Background-->
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
|
|
|
<TextBlock x:Uid="Profile_BackgroundHeader" Style="{StaticResource SubtitleTextBlockStyle}"/>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Background Image-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BackgroundImage"
|
|
|
|
x:Name="BackgroundImageContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBackgroundImagePath, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImagePath}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BackgroundImagePathOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Orientation="Vertical">
|
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBox Text="{x:Bind State.Profile.BackgroundImagePath, Mode=TwoWay, Converter={StaticResource DesktopWallpaperToEmptyStringConverter}}"
|
|
|
|
IsEnabled="{x:Bind State.Profile.BackgroundImagePath, Mode=OneWay, Converter={StaticResource StringIsNotDesktopConverter}}"
|
|
|
|
Style="{StaticResource TextBoxSettingStyle}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<Button x:Uid="Profile_BackgroundImageBrowse"
|
2021-02-08 19:04:43 +01:00
|
|
|
Click="BackgroundImage_Click"
|
|
|
|
IsEnabled="{x:Bind State.Profile.BackgroundImagePath, Mode=OneWay, Converter={StaticResource StringIsNotDesktopConverter}}"
|
|
|
|
Style="{StaticResource BrowseButtonStyle}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
|
|
|
<CheckBox x:Uid="Profile_UseDesktopImage"
|
2021-02-08 19:04:43 +01:00
|
|
|
x:Name="UseDesktopImageCheckBox"
|
|
|
|
IsChecked="{x:Bind State.Profile.UseDesktopBGImage, Mode=TwoWay}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Background Image Stretch Mode-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBackgroundImageStretchMode, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageStretchMode}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
|
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind BackgroundImageStretchModeList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentBackgroundImageStretchMode, Mode=TwoWay}"
|
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Background Image Alignment-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBackgroundImageAlignment, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageAlignment}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BackgroundImageAlignmentOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
|
|
|
|
<Grid HorizontalAlignment="Left">
|
|
|
|
<Grid.RowDefinitions>
|
|
|
|
<RowDefinition Height="Auto"/>
|
|
|
|
<RowDefinition Height="Auto"/>
|
|
|
|
<RowDefinition Height="Auto"/>
|
|
|
|
</Grid.RowDefinitions>
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
|
|
<Grid.Resources>
|
|
|
|
<Style TargetType="ToggleButton" BasedOn="{StaticResource DefaultToggleButtonStyle}">
|
|
|
|
<Setter Property="Margin" Value="2"/>
|
|
|
|
<Setter Property="Width" Value="40"/>
|
|
|
|
<Setter Property="Height" Value="40"/>
|
|
|
|
<Setter Property="ToolTipService.Placement" Value="Mouse"/>
|
|
|
|
</Style>
|
|
|
|
</Grid.Resources>
|
|
|
|
|
|
|
|
<!--Top Row-->
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentTopLeft"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_TopLeft"
|
|
|
|
Grid.Row="0" Grid.Column="0"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Left (0x01)-->
|
|
|
|
<x:Int32>17</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="" RenderTransformOrigin="0.5,0.5">
|
|
|
|
<FontIcon.RenderTransform>
|
|
|
|
<RotateTransform Angle="90"/>
|
|
|
|
</FontIcon.RenderTransform>
|
|
|
|
</FontIcon>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentTop"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_Top"
|
|
|
|
Grid.Row="0" Grid.Column="1"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Center (0x00)-->
|
|
|
|
<x:Int32>16</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="" RenderTransformOrigin="0.5,0.5">
|
|
|
|
<FontIcon.RenderTransform>
|
|
|
|
<RotateTransform Angle="180"/>
|
|
|
|
</FontIcon.RenderTransform>
|
|
|
|
</FontIcon>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentTopRight"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_TopRight"
|
|
|
|
Grid.Row="0" Grid.Column="2"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Top (0x10) | Horizontal_Right (0x02)-->
|
|
|
|
<x:Int32>18</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="" RenderTransformOrigin="0.5,0.5">
|
|
|
|
<FontIcon.RenderTransform>
|
|
|
|
<RotateTransform Angle="270"/>
|
|
|
|
</FontIcon.RenderTransform>
|
|
|
|
</FontIcon>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
|
|
|
|
<!--Middle Row-->
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentLeft"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_Left"
|
|
|
|
Grid.Row="1" Grid.Column="0"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Left (0x01)-->
|
|
|
|
<x:Int32>1</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentCenter"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_Center"
|
|
|
|
Grid.Row="1" Grid.Column="1"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Center (0x00)-->
|
|
|
|
<x:Int32>0</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentRight"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_Right"
|
|
|
|
Grid.Row="1" Grid.Column="2"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Center (0x00) | Horizontal_Right (0x02)-->
|
|
|
|
<x:Int32>2</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
|
|
|
|
<!--Bottom Row-->
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentBottomLeft"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_BottomLeft"
|
|
|
|
Grid.Row="2" Grid.Column="0"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Left (0x01)-->
|
|
|
|
<x:Int32>33</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentBottom"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_Bottom"
|
|
|
|
Grid.Row="2" Grid.Column="1"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Bottom (0x20) | Horizontal_Center (0x00)-->
|
|
|
|
<x:Int32>32</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
<ToggleButton x:Uid="Profile_BackgroundImageAlignmentBottomRight"
|
2020-12-18 00:14:07 +01:00
|
|
|
x:Name="BIAlign_BottomRight"
|
|
|
|
Grid.Row="2" Grid.Column="2"
|
|
|
|
Click="BIAlignment_Click">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleButton.Tag>
|
|
|
|
<!--ConvergedAlignment: Vertical_Top (0x20) | Horizontal_Right (0x02)-->
|
|
|
|
<x:Int32>34</x:Int32>
|
|
|
|
</ToggleButton.Tag>
|
|
|
|
<ToggleButton.Content>
|
|
|
|
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph=""/>
|
|
|
|
</ToggleButton.Content>
|
|
|
|
</ToggleButton>
|
|
|
|
</Grid>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Background Image Opacity-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
|
|
|
|
x:Name="BackgroundImageOpacityContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBackgroundImageOpacity, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBackgroundImageOpacity}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{x:Bind State.Profile.BackgroundImageSettingsVisible, Mode=OneWay}">
|
|
|
|
<Grid Style="{StaticResource CustomSliderControlGridStyle}">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Slider x:Name="BIOpacitySlider"
|
2020-12-18 00:14:07 +01:00
|
|
|
Grid.Column="0"
|
|
|
|
Value="{x:Bind State.Profile.BackgroundImageOpacity, Converter={StaticResource PercentageConverter}, Mode=TwoWay}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBlock Grid.Column="1"
|
2020-12-18 00:14:07 +01:00
|
|
|
Text="{Binding ElementName=BIOpacitySlider, Path=Value, Mode=OneWay}"
|
|
|
|
Style="{StaticResource SliderValueLabelStyle}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</Grid>
|
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Grouping: Acrylic-->
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
|
|
|
<TextBlock x:Uid="Profile_AcrylicHeader" Style="{StaticResource SubtitleTextBlockStyle}"/>
|
|
|
|
|
|
|
|
<!--Use Acrylic-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_UseAcrylic"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearUseAcrylic}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
|
|
|
<ToggleSwitch x:Name="UseAcrylicToggleSwitch"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
IsOn="{x:Bind State.Profile.UseAcrylic, Mode=TwoWay}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
|
|
|
|
<!--Acrylic Opacity-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_AcrylicOpacity"
|
|
|
|
x:Name="AcrylicOpacityContainer"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasAcrylicOpacity, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearAcrylicOpacity}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.AcrylicOpacityOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Visibility="{Binding ElementName=UseAcrylicToggleSwitch, Path=IsOn, Mode=OneWay}">
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel x:Name="AcrylicOpacityControl">
|
|
|
|
<Grid Style="{StaticResource CustomSliderControlGridStyle}">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Slider x:Name="AcrylicOpacitySlider"
|
2021-02-08 19:04:43 +01:00
|
|
|
Grid.Column="0"
|
|
|
|
Value="{x:Bind State.Profile.AcrylicOpacity, Converter={StaticResource PercentageConverter}, Mode=TwoWay}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<TextBlock Grid.Column="1"
|
2021-02-08 19:04:43 +01:00
|
|
|
Text="{Binding ElementName=AcrylicOpacitySlider, Path=Value, Mode=OneWay}"
|
|
|
|
Style="{StaticResource SliderValueLabelStyle}"/>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</Grid>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2021-01-13 19:08:40 +01:00
|
|
|
|
|
|
|
<!--Grouping: Window-->
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
|
|
|
<TextBlock x:Uid="Profile_WindowHeader" Style="{StaticResource SubtitleTextBlockStyle}"/>
|
2021-01-13 19:08:40 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Padding-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Padding"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearPadding}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
|
|
|
<Grid Style="{StaticResource CustomSliderControlGridStyle}">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
<ColumnDefinition Width="Auto"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Slider x:Name="PaddingSlider"
|
2021-01-26 03:22:24 +01:00
|
|
|
Grid.Column="0"
|
|
|
|
Value="{x:Bind State.Profile.Padding, Converter={StaticResource PaddingConverter}, Mode=TwoWay}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBlock Grid.Column="1"
|
2021-01-26 03:22:24 +01:00
|
|
|
Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}"
|
|
|
|
Style="{StaticResource SliderValueLabelStyle}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</Grid>
|
|
|
|
</local:SettingContainer>
|
2021-01-13 19:08:40 +01:00
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<!--Scrollbar Visibility-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasScrollState, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearScrollState}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.ScrollStateOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind ScrollStateList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentScrollState, Mode=TwoWay}"
|
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
|
|
|
</local:SettingContainer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
|
|
|
</ScrollViewer>
|
|
|
|
</PivotItem>
|
|
|
|
|
|
|
|
<!-- Advanced Tab -->
|
|
|
|
<PivotItem x:Uid="Profile_Advanced">
|
|
|
|
<ScrollViewer>
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<StackPanel Style="{StaticResource PivotStackStyle}">
|
2020-12-18 00:14:07 +01:00
|
|
|
<!--Suppress Application Title-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearSuppressApplicationTitle}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}"
|
2021-02-08 19:04:43 +01:00
|
|
|
Margin="0">
|
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.SuppressApplicationTitle, Mode=TwoWay}"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Antialiasing Mode-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_AntialiasingMode"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasAntialiasingMode, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind AntiAliasingModeList, Mode=OneWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
SelectedItem="{x:Bind CurrentAntiAliasingMode, Mode=TwoWay}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--AltGr Aliasing-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_AltGrAliasing"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasAltGrAliasing, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Snap On Input-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_SnapOnInput"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasSnapOnInput, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.SnapOnInputOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.SnapOnInput, Mode=TwoWay}"/>
|
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--History Size-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_HistorySize"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasHistorySize, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.HistorySizeOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:NumberBox Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
Style="{StaticResource NumberBoxSettingStyle}"
|
2021-03-04 18:47:23 +01:00
|
|
|
Minimum="0"
|
2020-12-18 00:14:07 +01:00
|
|
|
SmallChange="10"
|
|
|
|
LargeChange="100"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Close On Exit-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_CloseOnExit"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCloseOnExit, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CloseOnExitOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind CloseOnExitModeList, Mode=OneWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
SelectedItem="{x:Bind CurrentCloseOnExitMode, Mode=TwoWay}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
|
|
|
<!--Bell Style-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BellStyle"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBellStyle, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BellStyleOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<muxc:RadioButtons ItemsSource="{x:Bind BellStyleList, Mode=OneWay}"
|
2020-12-18 00:14:07 +01:00
|
|
|
SelectedItem="{x:Bind CurrentBellStyle, Mode=TwoWay}"
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [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've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"/>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
|
|
|
</ScrollViewer>
|
|
|
|
</PivotItem>
|
|
|
|
</Pivot>
|
|
|
|
</Grid>
|
2020-12-11 22:34:21 +01:00
|
|
|
</Page>
|