2021-03-30 00:09:38 +02: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:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
|
xmlns:local="using:Microsoft.Terminal.Settings.Editor"
|
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
|
xmlns:model="using:Microsoft.Terminal.Settings.Model"
|
|
|
|
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
|
|
|
mc:Ignorable="d">
|
2020-12-11 22:34:21 +01:00
|
|
|
|
|
|
|
<Page.Resources>
|
|
|
|
<ResourceDictionary>
|
|
|
|
<ResourceDictionary.MergedDictionaries>
|
2021-03-30 00:09:38 +02:00
|
|
|
<ResourceDictionary Source="CommonResources.xaml" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<DataTemplate x:Key="EnumRadioButtonTemplate"
|
|
|
|
x:DataType="local:EnumEntry">
|
|
|
|
<RadioButton Content="{x:Bind EnumName, Mode=OneWay}" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</DataTemplate>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<DataTemplate x:Key="EnumComboBoxItemTemplate"
|
|
|
|
x:DataType="local:EnumEntry">
|
|
|
|
<TextBlock Text="{x:Bind EnumName, Mode=OneWay}" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</DataTemplate>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<DataTemplate x:Key="FontFaceComboBoxItemTemplate"
|
|
|
|
x:DataType="local:Font">
|
|
|
|
<TextBlock FontFamily="{x:Bind Name}"
|
|
|
|
Text="{x:Bind LocalizedName}" />
|
2021-03-08 17:45:12 +01:00
|
|
|
</DataTemplate>
|
2020-12-11 22:34:21 +01:00
|
|
|
</ResourceDictionary>
|
|
|
|
</Page.Resources>
|
|
|
|
|
2021-03-30 00:09:38 +02: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>
|
2021-03-30 00:09:38 +02:00
|
|
|
<RowDefinition Height="auto" />
|
|
|
|
<RowDefinition Height="*" />
|
2020-12-18 00:14:07 +01:00
|
|
|
</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}"
|
2021-03-30 00:09:38 +02:00
|
|
|
Visibility="{x:Bind State.Profile.IsBaseLayer}" />
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-01-26 00:06:33 +01:00
|
|
|
<Pivot x:Name="ProfilesPivot"
|
2020-12-24 01:22:18 +01:00
|
|
|
Grid.Row="1"
|
2021-03-30 00:09:38 +02:00
|
|
|
Margin="1,0,0,0"
|
|
|
|
HorizontalAlignment="Left"
|
|
|
|
SelectionChanged="Pivot_SelectionChanged">
|
|
|
|
<!-- General Tab -->
|
2020-12-18 00:14:07 +01:00
|
|
|
<PivotItem x:Uid="Profile_General">
|
Manually dismiss popups when the window moves, or the SUI scrolls (#10922)
## Summary of the Pull Request
BODGY!
This solution was suggested in https://github.com/microsoft/microsoft-ui-xaml/issues/4554#issuecomment-887815332.
When the window moves, or when a ScrollViewer scrolls, dismiss any popups that are visible. This happens automagically when an app is a real XAML app, but it doesn't work for XAML Islands.
## References
* upstream at https://github.com/microsoft/microsoft-ui-xaml/issues/4554
## PR Checklist
* [x] Closes #9320
* [x] I work here
* [ ] Tests added/passed
* [ ] Requires documentation to be updated
## Detailed Description of the Pull Request / Additional comments
Unfortunately, we've got a bunch of scroll viewers in our SUI. So I did something bodgyx2 to make our life a little easier.
`DismissAllPopups` can be used to dismiss all popups for a particular UI element. However, we've got a bunch of pages with scroll viewers that may or may not have popups in them. Rather than define the same exact body for all their `ViewChanging` events, the `HasScrollViewer` struct will just do it for you!
Inside the `HasScrollViewer` stuct, we can't get at the `XamlRoot()` that our subclass implements. I mean, _we_ can, but when XAML does it's codegen, _XAML_ won't be able to figure it out.
Fortunately for us, we don't need to! The sender is a UIElement, so we can just get _their_ `XamlRoot()`.
So, you can fix this for any SUI page with just a simple
```diff
- <ScrollViewer>
+ <ScrollViewer ViewChanging="ViewChanging">
```
```diff
- struct AddProfile : AddProfileT<AddProfile>
+ struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile>
```
## Validation Steps Performed
* the window doesn't close when you move it
* the popups _do_ close when you move the window
* the popups close when you scroll any SUI page
2021-08-16 15:41:17 +02:00
|
|
|
<ScrollViewer ViewChanging="ViewChanging">
|
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-03-30 00:09:38 +02:00
|
|
|
<!-- Name -->
|
|
|
|
<!--
|
|
|
|
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.
|
|
|
|
-->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Name"
|
2021-11-09 23:38:31 +01:00
|
|
|
CurrentValue="{x:Bind State.Profile.Name, Mode=OneWay}"
|
2021-11-10 00:10:35 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}"
|
2021-08-04 00:25:23 +02:00
|
|
|
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<TextBox Style="{StaticResource TextBoxSettingStyle}"
|
|
|
|
Text="{x:Bind State.Profile.Name, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2021-01-23 00:43:54 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Commandline -->
|
|
|
|
<local:SettingContainer x:Name="CommandlineContainer"
|
|
|
|
x:Uid="Profile_Commandline"
|
2021-02-08 19:04:43 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
|
2021-11-10 00:10:35 +01:00
|
|
|
CurrentValue="{x:Bind State.Profile.Commandline, Mode=OneWay}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
|
2021-11-09 23:38:31 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}"
|
2021-08-04 00:25:23 +02:00
|
|
|
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
|
2020-12-18 00:14:07 +01:00
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-09-29 23:58:26 +02:00
|
|
|
<TextBox x:Uid="Profile_CommandlineBox"
|
|
|
|
IsSpellCheckEnabled="False"
|
2021-09-07 19:53:53 +02:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"
|
2021-03-30 00:09:38 +02:00
|
|
|
Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}" />
|
2020-12-18 00:14:07 +01:00
|
|
|
<Button x:Uid="Profile_CommandlineBrowse"
|
|
|
|
Click="Commandline_Click"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource BrowseButtonStyle}" />
|
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
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Starting Directory -->
|
|
|
|
<local:SettingContainer x:Name="StartingDirectoryContainer"
|
|
|
|
x:Uid="Profile_StartingDirectory"
|
2021-02-08 19:04:43 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
|
2021-11-10 00:10:35 +01:00
|
|
|
CurrentValue="{x:Bind State.Profile.StartingDirectory, Mode=OneWay}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
|
2021-11-10 00:10:35 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
|
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-01-14 20:06:10 +01:00
|
|
|
<StackPanel Orientation="Vertical">
|
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-09-29 23:58:26 +02:00
|
|
|
<TextBox x:Uid="Profile_StartingDirectoryBox"
|
|
|
|
IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
|
2021-09-07 19:53:53 +02:00
|
|
|
IsSpellCheckEnabled="False"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"
|
|
|
|
Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}" />
|
|
|
|
<Button x:Name="StartingDirectoryBrowse"
|
|
|
|
x:Uid="Profile_StartingDirectoryBrowse"
|
2021-02-08 19:04:43 +01:00
|
|
|
Click="StartingDirectory_Click"
|
|
|
|
IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource BrowseButtonStyle}" />
|
2021-01-14 20:06:10 +01:00
|
|
|
</StackPanel>
|
2021-03-30 00:09:38 +02:00
|
|
|
<CheckBox x:Name="StartingDirectoryUseParentCheckbox"
|
|
|
|
x:Uid="Profile_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
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Icon -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Icon"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
|
2021-11-09 23:38:31 +01:00
|
|
|
CurrentValue="{x:Bind State.Profile.Icon, Mode=OneWay}"
|
2021-11-10 00:10:35 +01:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}"
|
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2020-12-18 00:14:07 +01:00
|
|
|
<StackPanel Orientation="Horizontal">
|
2021-09-29 23:58:26 +02:00
|
|
|
<TextBox x:Uid="Profile_IconBox"
|
|
|
|
FontFamily="Segoe UI, Segoe MDL2 Assets"
|
2021-09-07 19:53:53 +02:00
|
|
|
IsSpellCheckEnabled="False"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource TextBoxSettingStyle}"
|
|
|
|
Text="{x:Bind State.Profile.Icon, Mode=TwoWay}" />
|
2020-12-18 00:14:07 +01:00
|
|
|
<Button x:Uid="Profile_IconBrowse"
|
|
|
|
Click="Icon_Click"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource BrowseButtonStyle}" />
|
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
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Tab Title -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_TabTitle"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
|
2021-11-09 23:38:31 +01:00
|
|
|
CurrentValue="{x:Bind State.Profile.TabTitle, Mode=OneWay}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
|
2021-11-10 00:10:35 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}"
|
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<TextBox Style="{StaticResource TextBoxSettingStyle}"
|
|
|
|
Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Hidden -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Hidden"
|
2021-08-04 00:25:23 +02:00
|
|
|
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.Hidden, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Delete Button -->
|
2021-08-24 00:00:08 +02:00
|
|
|
<Button x:Name="DeleteButton"
|
|
|
|
Margin="{StaticResource StandardControlMargin}"
|
|
|
|
Style="{StaticResource DeleteButtonStyle}"
|
|
|
|
Visibility="{x:Bind State.Profile.CanDeleteProfile}">
|
|
|
|
<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 FontSize="{StaticResource StandardIconSize}"
|
|
|
|
Glyph="" />
|
|
|
|
<TextBlock x:Uid="Profile_DeleteButton"
|
|
|
|
Margin="10,0,0,0" />
|
|
|
|
</StackPanel>
|
|
|
|
</Button.Content>
|
|
|
|
<Button.Flyout>
|
|
|
|
<Flyout>
|
|
|
|
<StackPanel>
|
|
|
|
<TextBlock x:Uid="Profile_DeleteConfirmationMessage"
|
|
|
|
Style="{StaticResource CustomFlyoutTextStyle}" />
|
|
|
|
<Button x:Uid="Profile_DeleteConfirmationButton"
|
|
|
|
Click="DeleteConfirmation_Click" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</StackPanel>
|
2021-08-24 00:00:08 +02:00
|
|
|
</Flyout>
|
|
|
|
</Button.Flyout>
|
|
|
|
</Button>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
|
|
|
</ScrollViewer>
|
|
|
|
</PivotItem>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Appearance Tab -->
|
2020-12-18 00:14:07 +01:00
|
|
|
<PivotItem x:Uid="Profile_Appearance">
|
Manually dismiss popups when the window moves, or the SUI scrolls (#10922)
## Summary of the Pull Request
BODGY!
This solution was suggested in https://github.com/microsoft/microsoft-ui-xaml/issues/4554#issuecomment-887815332.
When the window moves, or when a ScrollViewer scrolls, dismiss any popups that are visible. This happens automagically when an app is a real XAML app, but it doesn't work for XAML Islands.
## References
* upstream at https://github.com/microsoft/microsoft-ui-xaml/issues/4554
## PR Checklist
* [x] Closes #9320
* [x] I work here
* [ ] Tests added/passed
* [ ] Requires documentation to be updated
## Detailed Description of the Pull Request / Additional comments
Unfortunately, we've got a bunch of scroll viewers in our SUI. So I did something bodgyx2 to make our life a little easier.
`DismissAllPopups` can be used to dismiss all popups for a particular UI element. However, we've got a bunch of pages with scroll viewers that may or may not have popups in them. Rather than define the same exact body for all their `ViewChanging` events, the `HasScrollViewer` struct will just do it for you!
Inside the `HasScrollViewer` stuct, we can't get at the `XamlRoot()` that our subclass implements. I mean, _we_ can, but when XAML does it's codegen, _XAML_ won't be able to figure it out.
Fortunately for us, we don't need to! The sender is a UIElement, so we can just get _their_ `XamlRoot()`.
So, you can fix this for any SUI page with just a simple
```diff
- <ScrollViewer>
+ <ScrollViewer ViewChanging="ViewChanging">
```
```diff
- struct AddProfile : AddProfileT<AddProfile>
+ struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile>
```
## Validation Steps Performed
* the window doesn't close when you move it
* the popups _do_ close when you move the window
* the popups close when you scroll any SUI page
2021-08-16 15:41:17 +02:00
|
|
|
<ScrollViewer ViewChanging="ViewChanging">
|
2020-12-18 00:14:07 +01:00
|
|
|
<StackPanel>
|
2021-07-09 22:43:58 +02:00
|
|
|
<!-- Control Preview -->
|
|
|
|
<Border x:Name="ControlPreview"
|
|
|
|
Width="350"
|
|
|
|
Height="160"
|
|
|
|
Margin="0,0,0,12"
|
|
|
|
HorizontalAlignment="Left"
|
|
|
|
BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
|
|
|
|
BorderThickness="1" />
|
|
|
|
|
|
|
|
<local:Appearances Appearance="{x:Bind State.Profile.DefaultAppearance, Mode=OneWay}"
|
|
|
|
SourceProfile="{x:Bind State.Profile, Mode=OneWay}" />
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-09-20 19:08:13 +02:00
|
|
|
<!-- Grouping: Transparency -->
|
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-09-20 19:08:13 +02:00
|
|
|
<TextBlock x:Uid="Profile_TransparencyHeader"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource SubtitleTextBlockStyle}" />
|
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
|
|
|
|
2021-09-20 19:08:13 +02:00
|
|
|
<!-- Opacity -->
|
|
|
|
<local:SettingContainer x:Name="OpacityContainer"
|
|
|
|
x:Uid="Profile_Opacity"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearOpacity}"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasOpacity, Mode=OneWay}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.OpacityOverrideSource, Mode=OneWay}">
|
|
|
|
<StackPanel x:Name="OpacityControl">
|
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 Style="{StaticResource CustomSliderControlGridStyle}">
|
|
|
|
<Grid.ColumnDefinitions>
|
2021-03-30 00:09:38 +02:00
|
|
|
<ColumnDefinition Width="*" />
|
|
|
|
<ColumnDefinition Width="Auto" />
|
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>
|
2021-09-20 19:08:13 +02:00
|
|
|
<Slider x:Name="OpacitySlider"
|
2021-02-08 19:04:43 +01:00
|
|
|
Grid.Column="0"
|
2021-09-20 19:08:13 +02:00
|
|
|
Value="{x:Bind local:Converters.PercentageToPercentageValue(State.Profile.Opacity), BindBack=State.Profile.SetAcrylicOpacityPercentageValue, 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-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource SliderValueLabelStyle}"
|
2021-09-20 19:08:13 +02:00
|
|
|
Text="{x:Bind local:Converters.AppendPercentageSign(OpacitySlider.Value), 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
|
|
|
</Grid>
|
|
|
|
</StackPanel>
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2021-09-20 19:08:13 +02:00
|
|
|
|
|
|
|
<!-- Use Acrylic -->
|
|
|
|
<local:SettingContainer x:Uid="Profile_UseAcrylic"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearUseAcrylic}"
|
|
|
|
HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}">
|
|
|
|
<ToggleSwitch x:Name="UseAcrylicToggleSwitch"
|
|
|
|
IsOn="{x:Bind State.Profile.UseAcrylic, 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>
|
2021-01-13 19:08:40 +01:00
|
|
|
|
2021-03-30 00:09:38 +02: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}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<TextBlock x:Uid="Profile_WindowHeader"
|
|
|
|
Style="{StaticResource SubtitleTextBlockStyle}" />
|
2021-01-13 19:08:40 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Padding -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_Padding"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearPadding}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}">
|
2021-02-08 19:04:43 +01:00
|
|
|
<Grid Style="{StaticResource CustomSliderControlGridStyle}">
|
|
|
|
<Grid.ColumnDefinitions>
|
2021-03-30 00:09:38 +02:00
|
|
|
<ColumnDefinition Width="*" />
|
|
|
|
<ColumnDefinition Width="Auto" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<Slider x:Name="PaddingSlider"
|
2021-01-26 03:22:24 +01:00
|
|
|
Grid.Column="0"
|
2021-08-04 00:25:23 +02:00
|
|
|
Value="{x:Bind local:Converters.MaxValueFromPaddingString(State.Profile.Padding), BindBack=State.Profile.SetPadding, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
<TextBlock Grid.Column="1"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource SliderValueLabelStyle}"
|
|
|
|
Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</Grid>
|
|
|
|
</local:SettingContainer>
|
2021-01-13 19:08:40 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Scrollbar Visibility -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearScrollState}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasScrollState, Mode=OneWay}"
|
2021-11-08 19:49:49 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.ScrollStateOverrideSource, Mode=OneWay}"
|
2021-11-09 23:38:31 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-10-07 19:46:04 +02:00
|
|
|
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
|
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
|
2021-03-30 00:09:38 +02:00
|
|
|
ItemsSource="{x:Bind ScrollStateList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentScrollState, 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
|
|
|
</StackPanel>
|
2021-07-14 01:33:22 +02:00
|
|
|
<StackPanel>
|
|
|
|
<StackPanel Orientation="Horizontal"
|
|
|
|
Visibility="{x:Bind State.Profile.EditableUnfocusedAppearance, Mode=OneWay}">
|
|
|
|
<TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
|
|
|
|
Style="{StaticResource TitleTextBlockStyle}" />
|
|
|
|
<Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
|
|
|
|
Margin="32,0,0,0"
|
|
|
|
Click="CreateUnfocusedAppearance_Click"
|
|
|
|
Style="{StaticResource BaseButtonStyle}"
|
2021-08-04 00:25:23 +02:00
|
|
|
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.HasUnfocusedAppearance), Mode=OneWay}">
|
2021-07-14 01:33:22 +02:00
|
|
|
<Button.Content>
|
|
|
|
<FontIcon FontSize="{StaticResource StandardIconSize}"
|
|
|
|
Glyph="" />
|
|
|
|
</Button.Content>
|
|
|
|
</Button>
|
|
|
|
<Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
|
|
|
|
Margin="32,0,0,0"
|
|
|
|
Click="DeleteUnfocusedAppearance_Click"
|
|
|
|
Style="{StaticResource BaseButtonStyle}"
|
|
|
|
Visibility="{x:Bind State.Profile.HasUnfocusedAppearance, Mode=OneWay}">
|
|
|
|
<Button.Content>
|
|
|
|
<FontIcon FontSize="{StaticResource StandardIconSize}"
|
|
|
|
Glyph="" />
|
|
|
|
</Button.Content>
|
|
|
|
<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>
|
|
|
|
</StackPanel>
|
|
|
|
<local:Appearances Appearance="{x:Bind State.Profile.UnfocusedAppearance, Mode=OneWay}"
|
|
|
|
SourceProfile="{x:Bind State.Profile, Mode=OneWay}"
|
|
|
|
Visibility="{x:Bind State.Profile.ShowUnfocusedAppearance, Mode=OneWay}" />
|
|
|
|
</StackPanel>
|
2020-12-18 00:14:07 +01:00
|
|
|
</StackPanel>
|
|
|
|
</ScrollViewer>
|
|
|
|
</PivotItem>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Advanced Tab -->
|
2020-12-18 00:14:07 +01:00
|
|
|
<PivotItem x:Uid="Profile_Advanced">
|
Manually dismiss popups when the window moves, or the SUI scrolls (#10922)
## Summary of the Pull Request
BODGY!
This solution was suggested in https://github.com/microsoft/microsoft-ui-xaml/issues/4554#issuecomment-887815332.
When the window moves, or when a ScrollViewer scrolls, dismiss any popups that are visible. This happens automagically when an app is a real XAML app, but it doesn't work for XAML Islands.
## References
* upstream at https://github.com/microsoft/microsoft-ui-xaml/issues/4554
## PR Checklist
* [x] Closes #9320
* [x] I work here
* [ ] Tests added/passed
* [ ] Requires documentation to be updated
## Detailed Description of the Pull Request / Additional comments
Unfortunately, we've got a bunch of scroll viewers in our SUI. So I did something bodgyx2 to make our life a little easier.
`DismissAllPopups` can be used to dismiss all popups for a particular UI element. However, we've got a bunch of pages with scroll viewers that may or may not have popups in them. Rather than define the same exact body for all their `ViewChanging` events, the `HasScrollViewer` struct will just do it for you!
Inside the `HasScrollViewer` stuct, we can't get at the `XamlRoot()` that our subclass implements. I mean, _we_ can, but when XAML does it's codegen, _XAML_ won't be able to figure it out.
Fortunately for us, we don't need to! The sender is a UIElement, so we can just get _their_ `XamlRoot()`.
So, you can fix this for any SUI page with just a simple
```diff
- <ScrollViewer>
+ <ScrollViewer ViewChanging="ViewChanging">
```
```diff
- struct AddProfile : AddProfileT<AddProfile>
+ struct AddProfile : public HasScrollViewer<AddProfile>, AddProfileT<AddProfile>
```
## Validation Steps Performed
* the window doesn't close when you move it
* the popups _do_ close when you move the window
* the popups close when you scroll any SUI page
2021-08-16 15:41:17 +02:00
|
|
|
<ScrollViewer ViewChanging="ViewChanging">
|
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-03-30 00:09:38 +02:00
|
|
|
<!-- Suppress Application Title -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
|
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearSuppressApplicationTitle}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
|
|
|
|
SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
|
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.SuppressApplicationTitle, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Antialiasing Mode -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_AntialiasingMode"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearAntialiasingMode}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasAntialiasingMode, Mode=OneWay}"
|
2021-11-08 19:49:49 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.AntialiasingModeOverrideSource, Mode=OneWay}"
|
2021-11-09 23:38:31 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-10-07 19:46:04 +02:00
|
|
|
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
|
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
|
2021-03-30 00:09:38 +02:00
|
|
|
ItemsSource="{x:Bind AntiAliasingModeList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentAntiAliasingMode, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- AltGr Aliasing -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_AltGrAliasing"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearAltGrAliasing}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasAltGrAliasing, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Snap On Input -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_SnapOnInput"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearSnapOnInput}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasSnapOnInput, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.SnapOnInputOverrideSource, Mode=OneWay}">
|
2021-03-30 00:09:38 +02:00
|
|
|
<ToggleSwitch IsOn="{x:Bind State.Profile.SnapOnInput, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- History Size -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_HistorySize"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearHistorySize}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasHistorySize, Mode=OneWay}"
|
2021-02-20 00:50:52 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.HistorySizeOverrideSource, Mode=OneWay}">
|
2021-09-29 23:58:26 +02:00
|
|
|
<muxc:NumberBox x:Uid="Profile_HistorySizeBox"
|
|
|
|
LargeChange="100"
|
2021-03-04 18:47:23 +01:00
|
|
|
Minimum="0"
|
2020-12-18 00:14:07 +01:00
|
|
|
SmallChange="10"
|
2021-03-30 00:09:38 +02:00
|
|
|
Style="{StaticResource NumberBoxSettingStyle}"
|
|
|
|
Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Close On Exit -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_CloseOnExit"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearCloseOnExit}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasCloseOnExit, Mode=OneWay}"
|
2021-11-08 19:49:49 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.CloseOnExitOverrideSource, Mode=OneWay}"
|
2021-11-09 23:38:31 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-10-07 19:46:04 +02:00
|
|
|
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
|
|
|
|
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
|
2021-03-30 00:09:38 +02:00
|
|
|
ItemsSource="{x:Bind CloseOnExitModeList, Mode=OneWay}"
|
|
|
|
SelectedItem="{x:Bind CurrentCloseOnExitMode, Mode=TwoWay}" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</local:SettingContainer>
|
2020-12-18 00:14:07 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Bell Style -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<local:SettingContainer x:Uid="Profile_BellStyle"
|
2021-02-20 00:50:52 +01:00
|
|
|
ClearSettingValue="{x:Bind State.Profile.ClearBellStyle}"
|
2021-03-30 00:09:38 +02:00
|
|
|
HasSettingValue="{x:Bind State.Profile.HasBellStyle, Mode=OneWay}"
|
2021-11-08 19:49:49 +01:00
|
|
|
SettingOverrideSource="{x:Bind State.Profile.BellStyleOverrideSource, Mode=OneWay}"
|
2021-11-09 23:38:31 +01:00
|
|
|
Style="{StaticResource ExpanderSettingContainerStyle}">
|
2021-05-25 00:51:03 +02:00
|
|
|
<StackPanel>
|
|
|
|
<CheckBox x:Uid="Profile_BellStyleAudible"
|
|
|
|
IsChecked="{x:Bind IsBellStyleFlagSet(1), BindBack=SetBellStyleAudible, Mode=TwoWay}" />
|
|
|
|
<CheckBox x:Uid="Profile_BellStyleWindow"
|
|
|
|
IsChecked="{x:Bind IsBellStyleFlagSet(2), BindBack=SetBellStyleWindow, Mode=TwoWay}" />
|
|
|
|
<CheckBox x:Uid="Profile_BellStyleTaskbar"
|
|
|
|
IsChecked="{x:Bind IsBellStyleFlagSet(4), BindBack=SetBellStyleTaskbar, Mode=TwoWay}" />
|
|
|
|
</StackPanel>
|
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>
|