eb0fb3e822
This PR adds improved override message generation for inheritance in SUI. The settings model now has an `OriginTag` to be able to denote where a `Profile` came from. This tag is used in the `SettingContainer` to generate a more specific override message. ## References #6800 - SUI Epic #8919 - SUI Inheritance PR #8804 - SUI Inheritance (old issue) ## Detailed Description of the Pull Request / Additional comments - **Terminal Settings Model** - Introduced `PROJECTED_SETTING` as a macro to more easily declare the functions for each setting - Introduced `<setting>OverrideSource` which finds the `Profile` that has \<setting\> defined - Introduced `OriginTag Profile::Origin {Custom, InBox, Generated}` to trace where a profile came from - `DefaultProfileUtils` creates profiles for profile generators. So that now sets the `Origin` tag to `Generated` - `CascadiaSettings::LoadDefaults()` tags all profiles created as `InBox`. - The view model had to ingest the API change to be able to interact with `<setting>OverrideSource` - **Override Message Generation** - The reset button now has a more specific tooltip - The reset button now only appears if base layer is being overridden - We use the settings model changes to determine the message to display for the target ## Validation Steps Performed Tested the following cases: - overrides nothing (inherited setting) - overrides value inherited from... - base layer - a profile generator - in-box profile - global settings should not have this feature
57 lines
2.6 KiB
XML
57 lines
2.6 KiB
XML
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
|
|
the MIT License. See LICENSE in the project root for license information. -->
|
|
<ResourceDictionary
|
|
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:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
mc:Ignorable="d">
|
|
|
|
<Style x:Key="SettingContainerHeaderStyle" TargetType="StackPanel">
|
|
<Setter Property="Orientation" Value="Horizontal"/>
|
|
<Setter Property="Margin" Value="0,0,0,4"/>
|
|
</Style>
|
|
|
|
<Style x:Key="SettingContainerResetButtonStyle" TargetType="Button">
|
|
<Setter Property="Margin" Value="5,0,0,0"/>
|
|
<Setter Property="Height" Value="19"/>
|
|
<Setter Property="Width" Value="19"/>
|
|
<Setter Property="Padding" Value="0"/>
|
|
<Setter Property="Background" Value="Transparent"/>
|
|
</Style>
|
|
|
|
<Style x:Key="SettingContainerFontIconStyle" TargetType="FontIcon">
|
|
<Setter Property="Foreground" Value="{StaticResource SystemAccentColor}"/>
|
|
<Setter Property="FontSize" Value="14"/>
|
|
<Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
|
|
</Style>
|
|
|
|
<Style TargetType="local:SettingContainer">
|
|
<Setter Property="Margin" Value="0,24,0,0"/>
|
|
<Setter Property="IsTabStop" Value="False"/>
|
|
<Setter Property="Template">
|
|
<Setter.Value>
|
|
<ControlTemplate TargetType="local:SettingContainer">
|
|
<StackPanel>
|
|
|
|
<!--Header space-->
|
|
<StackPanel Style="{StaticResource SettingContainerHeaderStyle}">
|
|
<TextBlock Text="{TemplateBinding Header}"/>
|
|
<Button x:Name="ResetButton"
|
|
Style="{StaticResource SettingContainerResetButtonStyle}">
|
|
<FontIcon Glyph=""
|
|
Style="{StaticResource SettingContainerFontIconStyle}"/>
|
|
</Button>
|
|
</StackPanel>
|
|
|
|
<!--This is where the actual setting control will go-->
|
|
<ContentPresenter Content="{TemplateBinding Content}"/>
|
|
</StackPanel>
|
|
</ControlTemplate>
|
|
</Setter.Value>
|
|
</Setter>
|
|
</Style>
|
|
|
|
</ResourceDictionary>
|