Skip to content

Commit e396090

Browse files
committed
cleanup some unused colors xaml
1 parent d2cd572 commit e396090

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

UnityLauncherPro/GetProjects.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
143143
}
144144
else
145145
{
146-
Console.WriteLine("Missing buildTarget remap name for: "+ targetPlatform);
146+
if (string.IsNullOrEmpty(targetPlatform) == false) Console.WriteLine("Missing buildTarget remap name for: " + targetPlatform);
147147
p.TargetPlatform = null;
148148
}
149149

UnityLauncherPro/MainWindow.xaml

+4-26
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@
99
Title="UnityLauncherPro" Height="650" Width="880" WindowStartupLocation="CenterScreen" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" Activated="Window_Activated">
1010
<Window.Resources>
1111

12-
<!--TODO cleanup unused styles for dropdown menu-->
13-
<Color x:Key="ControlLightColor">Red</Color>
14-
<Color x:Key="ControlMediumColor">#FF7381F9</Color>
15-
<Color x:Key="ControlDarkColor">#FF211AA9</Color>
16-
<Color x:Key="ControlMouseOverColor">#FFFF0000</Color>
17-
<Color x:Key="ControlPressedColor">#FF211AA9</Color>
18-
<!--Border colors-->
19-
<Color x:Key="BorderLightColor">#FFFF0000</Color>
20-
<Color x:Key="BorderMediumColor">#FF888888</Color>
21-
<Color x:Key="BorderDarkColor">#FF444444</Color>
22-
<Color x:Key="PressedBorderLightColor">#FF888888</Color>
23-
<Color x:Key="PressedBorderDarkColor">#FF444444</Color>
24-
<Color x:Key="DisabledBorderLightColor">#FFAAAAAA</Color>
25-
<Color x:Key="DisabledBorderDarkColor">#FF888888</Color>
26-
<Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
27-
<!--Control-specific resources.-->
28-
<Color x:Key="HeaderTopColor">#FFC5CBF9</Color>
29-
<Color x:Key="DatagridCurrentCellBorderColor">Black</Color>
30-
<Color x:Key="SliderTrackDarkColor">#FFC5CBF9</Color>
31-
<Color x:Key="NavButtonFrameColor">#FF3843C4</Color>
32-
3312
<ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
3413
<Grid>
3514
<Grid.ColumnDefinitions>
@@ -43,7 +22,7 @@
4322
<Border Grid.Column="0" CornerRadius="0" Margin="0" >
4423
<Border.Background>
4524
<!--main combo background-->
46-
<SolidColorBrush Color="#FF1D1D1D"/>
25+
<SolidColorBrush Color="#FF3E3E44"/>
4726
</Border.Background>
4827
</Border>
4928
<!--combobox arrow-->
@@ -80,7 +59,6 @@
8059
<Setter Property="VerticalContentAlignment" Value="Center" />
8160
<Setter Property="HorizontalAlignment" Value="Stretch" />
8261
<Setter Property="VerticalAlignment" Value="Center" />
83-
<!--<Setter Property="OverridesDefaultStyle" Value="True"/>-->
8462

8563
<Setter Property="Template">
8664
<Setter.Value>
@@ -123,11 +101,11 @@
123101
<Grid x:Name="DropDown" SnapsToDevicePixels="True" MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
124102
<Border x:Name="DropDownBorder" BorderThickness="1">
125103
<Border.BorderBrush>
126-
<SolidColorBrush Color="{DynamicResource BorderMediumColor}" />
104+
<SolidColorBrush Color="#FF171717" />
127105
</Border.BorderBrush>
128106
<Border.Background>
129-
<!--combobox dropdown background here!-->
130-
<SolidColorBrush Color="#FF303030" />
107+
<!--combobox dropdown background here -->
108+
<SolidColorBrush Color="#FF2E2E34" />
131109
</Border.Background>
132110
</Border>
133111
<ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">

0 commit comments

Comments
 (0)