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

- Code Cleanup

Browse Source
This commit is contained in:
Stone-Red-Code
2021-10-26 18:40:45 +02:00
parent 9dd40c7ae8
commit d75aef7460
2 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DesktopMagic/MainWindow.xaml
+3 -3
View File
@@ -94,19 +94,19 @@
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0"> <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0">
<Rectangle x:Name="primaryColorRechtangle" Fill="White" /> <Rectangle x:Name="primaryColorRechtangle" Fill="White" />
</Border> </Border>
<Button Content="Change Primary Color" Height="23" FontSize="10" Click="ChangePrimaryColorButton_Click" /> <Button Content="Change Primary Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangePrimaryColorButton_Click"/>
</DockPanel> </DockPanel>
<DockPanel Margin="0,0,0,5"> <DockPanel Margin="0,0,0,5">
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0"> <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0">
<Rectangle x:Name="secondaryColorRechtangle" Fill="White" /> <Rectangle x:Name="secondaryColorRechtangle" Fill="White" />
</Border> </Border>
<Button Content="Change Secondary Color" Height="23" FontSize="10" Click="ChangeSecondaryColorButton_Click" /> <Button Content="Change Secondary Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangeSecondaryColorButton_Click" />
</DockPanel> </DockPanel>
<DockPanel > <DockPanel >
<Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0"> <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23" Margin="0,0,5,0">
<Rectangle x:Name="backgroundColorRechtangle" Fill="White" /> <Rectangle x:Name="backgroundColorRechtangle" Fill="White" />
</Border> </Border>
<Button Content="Change Background Color" Height="23" FontSize="10" Click="ChangeBackgroundColorButton_Click" /> <Button Content="Change Background Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangeBackgroundColorButton_Click" />
</DockPanel> </DockPanel>
</StackPanel> </StackPanel>
<Grid Grid.Row="1" VerticalAlignment="Bottom"> <Grid Grid.Row="1" VerticalAlignment="Bottom">
src/DesktopMagic/MainWindow.xaml.cs
+1 -11
View File
@@ -361,8 +361,6 @@ namespace DesktopMagic
private void MusicVisualizerColorTextBox_TextChanged(object sender, TextChangedEventArgs e) private void MusicVisualizerColorTextBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
if (!string.IsNullOrWhiteSpace(musicVisualizerColorTextBox.Text) && musicVisualizerColorTextBox.Text != "Default") if (!string.IsNullOrWhiteSpace(musicVisualizerColorTextBox.Text) && musicVisualizerColorTextBox.Text != "Default")
{
try
{ {
if (musicVisualizerColorTextBox.Text.Length > 0) if (musicVisualizerColorTextBox.Text.Length > 0)
{ {
@@ -390,12 +388,9 @@ namespace DesktopMagic
} }
string hex = musicVisualizerColorTextBox.Text; string hex = musicVisualizerColorTextBox.Text;
hex = hex.Replace("#", "");
if (hex.Length == 6) if (MultiColorConverter.TryConvertToSystemColor(hex, out System.Drawing.Color systemColor))
{ {
System.Drawing.Color systemColor = System.Drawing.Color.FromArgb((byte)int.Parse(hex.Substring(0, 2), System.Globalization.NumberStyles.HexNumber), (byte)int.Parse(hex.Substring(2, 2), System.Globalization.NumberStyles.HexNumber), (byte)int.Parse(hex.Substring(4, 2), System.Globalization.NumberStyles.HexNumber));
MusicVisualzerColor = systemColor; MusicVisualzerColor = systemColor;
musicVisualizerColorTextBox.Foreground = Brushes.Black; musicVisualizerColorTextBox.Foreground = Brushes.Black;
@@ -407,11 +402,6 @@ namespace DesktopMagic
musicVisualizerColorTextBox.Foreground = Brushes.Red; musicVisualizerColorTextBox.Foreground = Brushes.Red;
} }
} }
catch
{
musicVisualizerColorTextBox.Foreground = Brushes.Red;
}
}
else else
{ {
MusicVisualzerColor = null; MusicVisualzerColor = null;