Stone_Red/DesktopMagic
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/DesktopMagic.git synced 2026-09-04 08:56:15 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Replace Rectangle fill with Border background for color selection UI

Browse Source
This commit is contained in:
Stone_Red
2026-01-17 00:16:34 +01:00
parent 990793fb01
commit dd9953cb7d
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DesktopMagic/Dialogs/ColorDialog.xaml
+1 -3
View File
@@ -62,9 +62,7 @@
</DockPanel> </DockPanel>
</Grid> </Grid>
<DockPanel Margin="0 5 0 0"> <DockPanel Margin="0 5 0 0">
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="35" Width="35" Margin="0,0,5,0"> <Border x:Name="colorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
<Rectangle x:Name="colorRechtangle" Fill="White" />
</Border>
<TextBox x:Name="colorHexTextBox" MaxLength="9" CharacterCasing="Upper" TextWrapping="Wrap" TextChanged="ColorHexTextBox_TextChanged" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center"/> <TextBox x:Name="colorHexTextBox" MaxLength="9" CharacterCasing="Upper" TextWrapping="Wrap" TextChanged="ColorHexTextBox_TextChanged" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center"/>
</DockPanel> </DockPanel>
</StackPanel> </StackPanel>
src/DesktopMagic/Dialogs/ColorDialog.xaml.cs
+1 -1
View File
@@ -88,7 +88,7 @@ public partial class ColorDialog : FluentWindow
ResultBrush = brush; ResultBrush = brush;
ResultColor = systemColor; ResultColor = systemColor;
colorRechtangle.Fill = brush; colorRechtangle.Background = brush;
colorHexTextBox.Foreground = FindResource("TextFillColorPrimaryBrush") as Brush; colorHexTextBox.Foreground = FindResource("TextFillColorPrimaryBrush") as Brush;
} }
else else
src/DesktopMagic/Dialogs/ThemeDialog.xaml
+3 -9
View File
@@ -70,21 +70,15 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<DockPanel Grid.Row="0"> <DockPanel Grid.Row="0">
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0"> <Border x:Name="primaryColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
<Rectangle x:Name="primaryColorRechtangle" Fill="White" />
</Border>
<Button Content="Change Primary Color" FontWeight="Regular" Click="ChangePrimaryColorButton_Click" HorizontalAlignment="Stretch" /> <Button Content="Change Primary Color" FontWeight="Regular" Click="ChangePrimaryColorButton_Click" HorizontalAlignment="Stretch" />
</DockPanel> </DockPanel>
<DockPanel Grid.Row="1"> <DockPanel Grid.Row="1">
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0"> <Border x:Name="secondaryColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
<Rectangle x:Name="secondaryColorRechtangle" Fill="White" />
</Border>
<Button Content="Change Secondary Color" FontWeight="Regular" Click="ChangeSecondaryColorButton_Click" HorizontalAlignment="Stretch" /> <Button Content="Change Secondary Color" FontWeight="Regular" Click="ChangeSecondaryColorButton_Click" HorizontalAlignment="Stretch" />
</DockPanel> </DockPanel>
<DockPanel Grid.Row="2"> <DockPanel Grid.Row="2">
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" Background="White" Height="30" Width="30" Margin="0,0,5,0"> <Border x:Name="backgroundColorRechtangle" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}" Background="White" Height="30" Width="30" Margin="0,0,10,0" />
<Rectangle x:Name="backgroundColorRechtangle" Fill="White" />
</Border>
<Button Content="Change Background Color" FontWeight="Regular" Click="ChangeBackgroundColorButton_Click" HorizontalAlignment="Stretch" /> <Button Content="Change Background Color" FontWeight="Regular" Click="ChangeBackgroundColorButton_Click" HorizontalAlignment="Stretch" />
</DockPanel> </DockPanel>
</Grid> </Grid>
src/DesktopMagic/Dialogs/ThemeDialog.xaml.cs
+6 -6
View File
@@ -24,9 +24,9 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
cornerRadiusTextBox.Value = theme.CornerRadius; cornerRadiusTextBox.Value = theme.CornerRadius;
marginTextBox.Value = theme.Margin; marginTextBox.Value = theme.Margin;
primaryColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.PrimaryColor)); primaryColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.PrimaryColor));
secondaryColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.SecondaryColor)); secondaryColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.SecondaryColor));
backgroundColorRechtangle.Fill = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.BackgroundColor)); backgroundColorRechtangle.Background = new SolidColorBrush(MultiColorConverter.ConvertToMediaColor(theme.BackgroundColor));
label.Content = content; label.Content = content;
Title = title; Title = title;
@@ -81,7 +81,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
if (colorDialog.ShowDialog() == true) if (colorDialog.ShowDialog() == true)
{ {
theme.PrimaryColor = colorDialog.ResultColor; theme.PrimaryColor = colorDialog.ResultColor;
primaryColorRechtangle.Fill = colorDialog.ResultBrush; primaryColorRechtangle.Background = colorDialog.ResultBrush;
} }
} }
@@ -95,7 +95,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
if (colorDialog.ShowDialog() == true) if (colorDialog.ShowDialog() == true)
{ {
theme.SecondaryColor = colorDialog.ResultColor; theme.SecondaryColor = colorDialog.ResultColor;
secondaryColorRechtangle.Fill = colorDialog.ResultBrush; secondaryColorRechtangle.Background = colorDialog.ResultBrush;
} }
} }
@@ -109,7 +109,7 @@ public partial class ThemeDialog : Wpf.Ui.Controls.FluentWindow
if (colorDialog.ShowDialog() == true) if (colorDialog.ShowDialog() == true)
{ {
theme.BackgroundColor = colorDialog.ResultColor; theme.BackgroundColor = colorDialog.ResultColor;
backgroundColorRechtangle.Fill = colorDialog.ResultBrush; backgroundColorRechtangle.Background = colorDialog.ResultBrush;
} }
} }