Skip to content

Commit 0a4da97

Browse files
committed
PRE-MERGE #18559 Add Extensions page to Settings UI
2 parents 2c75721 + 34c6115 commit 0a4da97

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1940
-90
lines changed
943 Bytes
Loading
1.33 KB
Loading
787 Bytes
Loading
1.58 KB
Loading
1.63 KB
Loading

src/cascadia/CascadiaResources.build.items

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<DeploymentContent>true</DeploymentContent>
2222
<Link>ProfileIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
2323
</Content>
24+
<!-- Profile Generator Icons -->
25+
<Content Include="$(OpenConsoleDir)src\cascadia\CascadiaPackage\ProfileGeneratorIcons\**\*">
26+
<DeploymentContent>true</DeploymentContent>
27+
<Link>ProfileGeneratorIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
28+
</Content>
2429
<!-- Default Settings -->
2530
<Content Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\defaults.json">
2631
<DeploymentContent>true</DeploymentContent>

src/cascadia/TerminalSettingsEditor/AddProfile.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<IconSourceElement Grid.Column="0"
6060
Width="16"
6161
Height="16"
62-
IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(Icon), Mode=OneTime}" />
62+
IconSource="{x:Bind mtu:IconPathConverter.IconSourceWUX(EvaluatedIcon), Mode=OneTime}" />
6363

6464
<TextBlock Grid.Column="1"
6565
Text="{x:Bind Name}" />

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@
11991199
<Setter Property="HorizontalAlignment" Value="Stretch" />
12001200
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
12011201
<Setter Property="VerticalAlignment" Value="Stretch" />
1202-
<Setter Property="HorizontalContentAlignment" Value="Left" />
1202+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
12031203
<Setter Property="VerticalContentAlignment" Value="Center" />
12041204
<Setter Property="Template">
12051205
<Setter.Value>
@@ -1222,7 +1222,8 @@
12221222
Content="{TemplateBinding Content}"
12231223
ContentTemplate="{TemplateBinding ContentTemplate}"
12241224
ContentTransitions="{TemplateBinding ContentTransitions}" />
1225-
<FontIcon Margin="20,0,8,0"
1225+
<FontIcon Grid.Column="1"
1226+
Margin="20,0,8,0"
12261227
HorizontalAlignment="Right"
12271228
FontSize="10"
12281229
FontWeight="Black"
@@ -1266,4 +1267,24 @@
12661267
</Setter.Value>
12671268
</Setter>
12681269
</Style>
1270+
1271+
<Style x:Key="NewInfoBadge"
1272+
TargetType="muxc:InfoBadge">
1273+
<Setter Property="Padding" Value="5,1,5,2" />
1274+
<Setter Property="Template">
1275+
<Setter.Value>
1276+
<ControlTemplate TargetType="muxc:InfoBadge">
1277+
<Border x:Name="RootGrid"
1278+
Padding="{TemplateBinding Padding}"
1279+
Background="{TemplateBinding Background}"
1280+
CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.InfoBadgeCornerRadius}">
1281+
<TextBlock x:Uid="NewInfoBadgeTextBlock"
1282+
HorizontalAlignment="Center"
1283+
VerticalAlignment="Center"
1284+
FontSize="10" />
1285+
</Border>
1286+
</ControlTemplate>
1287+
</Setter.Value>
1288+
</Setter>
1289+
</Style>
12691290
</ResourceDictionary>

0 commit comments

Comments
 (0)