From 9591d75d4fd9c1e7db1187bdb4eab4948f23505b Mon Sep 17 00:00:00 2001 From: Laszlo Nemeth <57342539+donlaci@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:26:46 +0200 Subject: [PATCH] [Workspaces]Fix button borders (#34553) * [Workspaces] fix button borders * xaml formatting * Fix Border brush invisible on Dark theme --------- Co-authored-by: Stefan Markovic Co-authored-by: Jaime Bernardo --- src/modules/Workspaces/WorkspacesEditor/MainPage.xaml | 3 ++- .../Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml index 8ea28b9edfc..aa2ec3f6d18 100644 --- a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml +++ b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml @@ -150,6 +150,7 @@ Width="140" Background="{DynamicResource SecondaryBackgroundBrush}" BorderBrush="{DynamicResource PrimaryBorderBrush}" + BorderThickness="2" SelectedIndex="{Binding OrderByIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"> @@ -307,7 +308,7 @@ AutomationProperties.Name="{x:Static props:Resources.Launch}" Background="{DynamicResource TertiaryBackgroundBrush}" BorderBrush="{DynamicResource SecondaryBorderBrush}" - BorderThickness="1" + BorderThickness="2" Click="LaunchButton_Click" Content="{x:Static props:Resources.Launch}" /> diff --git a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml index a9f352b29e0..bb8c373f507 100644 --- a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml +++ b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml @@ -109,6 +109,8 @@ Padding="24,6" AutomationProperties.Name="{x:Static props:Resources.Delete}" Background="{DynamicResource TertiaryBackgroundBrush}" + BorderBrush="{DynamicResource SecondaryBorderBrush}" + BorderThickness="2" Click="DeleteButtonClicked" Content="{Binding DeleteButtonContent, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="True" /> @@ -338,6 +340,8 @@ HorizontalAlignment="Right" AutomationProperties.Name="{x:Static props:Resources.Revert}" Background="{DynamicResource SecondaryBackgroundBrush}" + BorderBrush="{DynamicResource PrimaryBorderBrush}" + BorderThickness="2" Click="RevertButtonClicked" Content="{x:Static props:Resources.Revert}" DockPanel.Dock="Right" @@ -350,6 +354,8 @@ HorizontalAlignment="Right" AutomationProperties.Name="{x:Static props:Resources.LaunchEdit}" Background="{DynamicResource SecondaryBackgroundBrush}" + BorderBrush="{DynamicResource PrimaryBorderBrush}" + BorderThickness="2" Click="LaunchEditButtonClicked" Content="{x:Static props:Resources.LaunchEdit}" DockPanel.Dock="Right" /> @@ -402,6 +408,8 @@ Padding="24,0,24,0" AutomationProperties.Name="{x:Static props:Resources.Cancel}" Background="{DynamicResource SecondaryBackgroundBrush}" + BorderBrush="{DynamicResource PrimaryBorderBrush}" + BorderThickness="2" Click="CancelButtonClicked" Content="{x:Static props:Resources.Cancel}" />