Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Workspaces]Fix button borders (#34553)

Browse Source 
* [Workspaces] fix button borders

* xaml formatting

* Fix Border brush invisible on Dark theme

---------

Co-authored-by: Stefan Markovic <stefan@janeasystems.com>
Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>
This commit is contained in:
Laszlo Nemeth
2024-09-05 20:26:46 +02:00
committed by GitHub
parent de00e1d87c
commit 9591d75d4f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
View File

@@ -150,6 +150,7 @@
Width="140" Width="140"
Background="{DynamicResource SecondaryBackgroundBrush}" Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}" BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="2"
SelectedIndex="{Binding OrderByIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"> SelectedIndex="{Binding OrderByIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<ComboBoxItem Content="{x:Static props:Resources.LastLaunched}" /> <ComboBoxItem Content="{x:Static props:Resources.LastLaunched}" />
<ComboBoxItem Content="{x:Static props:Resources.Created}" /> <ComboBoxItem Content="{x:Static props:Resources.Created}" />
@@ -307,7 +308,7 @@
AutomationProperties.Name="{x:Static props:Resources.Launch}" AutomationProperties.Name="{x:Static props:Resources.Launch}"
Background="{DynamicResource TertiaryBackgroundBrush}" Background="{DynamicResource TertiaryBackgroundBrush}"
BorderBrush="{DynamicResource SecondaryBorderBrush}" BorderBrush="{DynamicResource SecondaryBorderBrush}"
BorderThickness="1" BorderThickness="2"
Click="LaunchButton_Click" Click="LaunchButton_Click"
Content="{x:Static props:Resources.Launch}" /> Content="{x:Static props:Resources.Launch}" />
</StackPanel> </StackPanel>

8
src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
View File

@@ -109,6 +109,8 @@
Padding="24,6" Padding="24,6"
AutomationProperties.Name="{x:Static props:Resources.Delete}" AutomationProperties.Name="{x:Static props:Resources.Delete}"
Background="{DynamicResource TertiaryBackgroundBrush}" Background="{DynamicResource TertiaryBackgroundBrush}"
BorderBrush="{DynamicResource SecondaryBorderBrush}"
BorderThickness="2"
Click="DeleteButtonClicked" Click="DeleteButtonClicked"
Content="{Binding DeleteButtonContent, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Content="{Binding DeleteButtonContent, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="True" /> IsEnabled="True" />
@@ -338,6 +340,8 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
AutomationProperties.Name="{x:Static props:Resources.Revert}" AutomationProperties.Name="{x:Static props:Resources.Revert}"
Background="{DynamicResource SecondaryBackgroundBrush}" Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="2"
Click="RevertButtonClicked" Click="RevertButtonClicked"
Content="{x:Static props:Resources.Revert}" Content="{x:Static props:Resources.Revert}"
DockPanel.Dock="Right" DockPanel.Dock="Right"
@@ -350,6 +354,8 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
AutomationProperties.Name="{x:Static props:Resources.LaunchEdit}" AutomationProperties.Name="{x:Static props:Resources.LaunchEdit}"
Background="{DynamicResource SecondaryBackgroundBrush}" Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="2"
Click="LaunchEditButtonClicked" Click="LaunchEditButtonClicked"
Content="{x:Static props:Resources.LaunchEdit}" Content="{x:Static props:Resources.LaunchEdit}"
DockPanel.Dock="Right" /> DockPanel.Dock="Right" />
@@ -402,6 +408,8 @@
Padding="24,0,24,0" Padding="24,0,24,0"
AutomationProperties.Name="{x:Static props:Resources.Cancel}" AutomationProperties.Name="{x:Static props:Resources.Cancel}"
Background="{DynamicResource SecondaryBackgroundBrush}" Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="2"
Click="CancelButtonClicked" Click="CancelButtonClicked"
Content="{x:Static props:Resources.Cancel}" /> Content="{x:Static props:Resources.Cancel}" />
<Button <Button