Skip to content

Commit e8b7894

Browse files
unitycoderunitycoder
committed
change static color resource references to dynamic
1 parent f090288 commit e8b7894

File tree

4 files changed

+41
-38
lines changed

4 files changed

+41
-38
lines changed

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!--mouseover combobox main-->
3737
<ControlTemplate.Triggers>
3838
<Trigger Property="UIElement.IsMouseOver" Value="True">
39-
<Setter Property="Panel.Background" TargetName="Border" Value="{StaticResource ThemeDataGridRowMouseOver}" />
39+
<Setter Property="Panel.Background" TargetName="Border" Value="{DynamicResource ThemeDataGridRowMouseOver}" />
4040
</Trigger>
4141
</ControlTemplate.Triggers>
4242
</ControlTemplate>
@@ -155,7 +155,7 @@
155155
<Setter TargetName="Border" Property="Background" Value="DarkBlue"></Setter>
156156
</Trigger>
157157
<Trigger Property="ComboBoxItem.IsSelected" Value="True">
158-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}"></Setter>
158+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeDataGridRowSelectedBackground}"></Setter>
159159
<Setter TargetName="Border" Property="TextElement.Foreground" Value="White"></Setter>
160160
</Trigger>
161161
</ControlTemplate.Triggers>
@@ -187,15 +187,15 @@
187187
</Border>
188188
<ControlTemplate.Triggers>
189189
<Trigger Property="IsSelected" Value="False">
190-
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="{StaticResource ThemeDeactiveTabForeground}"/>
191-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeDeactiveTabBackground}" />
190+
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="{DynamicResource ThemeDeactiveTabForeground}"/>
191+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeDeactiveTabBackground}" />
192192
</Trigger>
193193
<Trigger Property="IsSelected" Value="True">
194-
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="{StaticResource ThemeButtonWhiteText}"/>
195-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeMainBackgroundColor}"/>
194+
<Setter Property="TextElement.Foreground" TargetName="ContentSite" Value="{DynamicResource ThemeButtonWhiteText}"/>
195+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeMainBackgroundColor}"/>
196196
</Trigger>
197197
<Trigger Property="IsMouseOver" Value="True">
198-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeMainBackgroundColor}"/>
198+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeMainBackgroundColor}"/>
199199
</Trigger>
200200
</ControlTemplate.Triggers>
201201
</ControlTemplate>
@@ -205,32 +205,32 @@
205205

206206
<!-- datagrid header -->
207207
<Style x:Key="HeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
208-
<Setter Property="Background" Value="{StaticResource ThemeDatagridHeaderBackground}" />
209-
<Setter Property="Foreground" Value="{StaticResource ThemeDatagridHeaderForeground}" />
210-
<Setter Property="BorderBrush" Value="{StaticResource ThemeDatagridHeaderBorder}" />
208+
<Setter Property="Background" Value="{DynamicResource ThemeDatagridHeaderBackground}" />
209+
<Setter Property="Foreground" Value="{DynamicResource ThemeDatagridHeaderForeground}" />
210+
<Setter Property="BorderBrush" Value="{DynamicResource ThemeDatagridHeaderBorder}" />
211211
<Setter Property="BorderThickness" Value="0,0,1,1" />
212212
<Setter Property="SnapsToDevicePixels" Value="True" />
213213
<Setter Property="HorizontalContentAlignment" Value="Left" />
214214
<Setter Property="Height" Value="28" />
215215
<Setter Property="Padding" Value="6,2,2,2" />
216216
<Style.Triggers>
217217
<Trigger Property="IsMouseOver" Value="True">
218-
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}"/>
218+
<Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}"/>
219219
</Trigger>
220220
</Style.Triggers>
221221
</Style>
222222

223223
<!-- datagrid rows & row selection -->
224224
<Style TargetType="{x:Type DataGridRow}">
225-
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}" />
225+
<Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}" />
226226
<Setter Property="BorderBrush" Value="{x:Null}" />
227227
<Setter Property="BorderThickness" Value="0,0,0,0" />
228228
<Style.Triggers>
229229
<Trigger Property="IsMouseOver" Value="True">
230-
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowMouseOver}"/>
230+
<Setter Property="Background" Value="{DynamicResource ThemeDataGridRowMouseOver}"/>
231231
</Trigger>
232232
<Trigger Property="IsSelected" Value="True">
233-
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}" />
233+
<Setter Property="Background" Value="{DynamicResource ThemeDataGridRowSelectedBackground}" />
234234
</Trigger>
235235
</Style.Triggers>
236236
<Style.Resources>
@@ -271,15 +271,15 @@
271271
</Border>
272272
<ControlTemplate.Triggers>
273273
<Trigger Property="IsEnabled" Value="False">
274-
<Setter Property="Foreground" Value="{StaticResource ThemeButtonForegroundDisabled}" />
274+
<Setter Property="Foreground" Value="{DynamicResource ThemeButtonForegroundDisabled}" />
275275
</Trigger>
276276
<Trigger Property="IsMouseOver" Value="true">
277-
<Setter TargetName="shortcutbutton" Property="Background" Value="{StaticResource ThemeButtonBackgroundMouseOver}" />
278-
<Setter Property="TextElement.Foreground" TargetName="shortcutbutton" Value="{StaticResource ThemeButtonWhiteText}"/>
277+
<Setter TargetName="shortcutbutton" Property="Background" Value="{DynamicResource ThemeButtonBackgroundMouseOver}" />
278+
<Setter Property="TextElement.Foreground" TargetName="shortcutbutton" Value="{DynamicResource ThemeButtonWhiteText}"/>
279279
</Trigger>
280280
<Trigger Property="IsPressed" Value="true">
281-
<Setter TargetName="shortcutbutton" Property="Background" Value="{StaticResource ThemeButtonBackgroundPressed}" />
282-
<Setter Property="TextElement.Foreground" TargetName="shortcutbutton" Value="{StaticResource ThemeButtonWhiteText}"/>
281+
<Setter TargetName="shortcutbutton" Property="Background" Value="{DynamicResource ThemeButtonBackgroundPressed}" />
282+
<Setter Property="TextElement.Foreground" TargetName="shortcutbutton" Value="{DynamicResource ThemeButtonWhiteText}"/>
283283
</Trigger>
284284
</ControlTemplate.Triggers>
285285
</ControlTemplate>
@@ -303,13 +303,13 @@
303303
<ControlTemplate.Triggers>
304304
<!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten -->
305305
<Trigger Property="IsMouseOver" Value="true">
306-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeTextBoxBackground}" />
306+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeTextBoxBackground}" />
307307
</Trigger>
308308
<Trigger Property="IsPressed" Value="true">
309-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollArrowPressed}" />
309+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollArrowPressed}" />
310310
</Trigger>
311311
<Trigger Property="IsEnabled" Value="false">
312-
<Setter Property="Foreground" Value="{StaticResource ThemeScrollBarEnabledForeground}"/>
312+
<Setter Property="Foreground" Value="{DynamicResource ThemeScrollBarEnabledForeground}"/>
313313
</Trigger>
314314
</ControlTemplate.Triggers>
315315
</ControlTemplate>
@@ -343,7 +343,7 @@
343343
<Border x:Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
344344
<ControlTemplate.Triggers>
345345
<Trigger Property="IsMouseOver" Value="true">
346-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollBarThumbFill}" />
346+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollBarThumbFill}" />
347347
</Trigger>
348348
</ControlTemplate.Triggers>
349349
</ControlTemplate>
@@ -464,10 +464,10 @@
464464
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" Width="72">
465465
<DataGridTextColumn.CellStyle>
466466
<Style TargetType="{x:Type DataGridCell}">
467-
<Setter Property="Foreground" Value="{StaticResource ThemeGridRedText}" />
467+
<Setter Property="Foreground" Value="{DynamicResource ThemeGridRedText}" />
468468
<Style.Triggers>
469469
<DataTrigger Binding="{Binding Version, Converter={StaticResource VersionInstalledConverter}}" Value="true">
470-
<Setter Property="Foreground" Value="{StaticResource ThemeGridGreenText}" />
470+
<Setter Property="Foreground" Value="{DynamicResource ThemeGridGreenText}" />
471471
</DataTrigger>
472472
</Style.Triggers>
473473
</Style>
@@ -479,7 +479,7 @@
479479
<Style TargetType="{x:Type DataGridCell}">
480480
<Style.Triggers>
481481
<DataTrigger Binding="{Binding folderExists, Converter={StaticResource ProjectExistsConverter}}" Value="false">
482-
<Setter Property="Foreground" Value="{StaticResource ThemeGridRedText}" />
482+
<Setter Property="Foreground" Value="{DynamicResource ThemeGridRedText}" />
483483
</DataTrigger>
484484
</Style.Triggers>
485485
</Style>
@@ -720,7 +720,7 @@
720720
<Style TargetType="{x:Type DataGridCell}">
721721
<Style.Triggers>
722722
<DataTrigger Binding="{Binding Version, Converter={StaticResource VersionInstalledConverter}}" Value="true">
723-
<Setter Property="Foreground" Value="{StaticResource ThemeGridGreenText}" />
723+
<Setter Property="Foreground" Value="{DynamicResource ThemeGridGreenText}" />
724724
</DataTrigger>
725725
</Style.Triggers>
726726
</Style>

‎UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,7 +1752,7 @@ void ApplyTheme()
17521752

17531753
//Console.WriteLine("Load theme: " + themefile);
17541754

1755-
if (File.Exists(themefile))
1755+
if (File.Exists(themefile) == true)
17561756
{
17571757
var colors = File.ReadAllLines(themefile);
17581758

@@ -1769,6 +1769,7 @@ void ApplyTheme()
17691769
// parse color
17701770
try
17711771
{
1772+
//Console.WriteLine(row[0] +"="+ row[1].Trim());
17721773
var col = new BrushConverter().ConvertFrom(row[1].Trim());
17731774
// apply color
17741775
Application.Current.Resources[row[0]] = (SolidColorBrush)col;
@@ -1792,6 +1793,8 @@ void ResetTheme()
17921793

17931794
private void ChkUseCustomTheme_Checked(object sender, RoutedEventArgs e)
17941795
{
1796+
if (this.IsActive == false) return; // dont run code on window init
1797+
17951798
var isChecked = (bool)((CheckBox)sender).IsChecked;
17961799
Properties.Settings.Default.useCustomTheme = isChecked;
17971800
Properties.Settings.Default.Save();

‎UnityLauncherPro/NewProject.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<!--TODO move to styles-->
3434
<!-- datagrid rows & row selection -->
3535
<Style TargetType="DataGridRow">
36-
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}" />
36+
<Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}" />
3737
<Setter Property="BorderBrush" Value="{x:Null}" />
3838
<Setter Property="BorderThickness" Value="0,0,0,0" />
3939
<Style.Triggers>
4040
<!--<Trigger Property="IsMouseOver" Value="True">
4141
<Setter Property="Background" Value="{StaticResource DataGridRowMouseOver}"/>
4242
</Trigger>-->
4343
<Trigger Property="IsSelected" Value="True">
44-
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}" />
44+
<Setter Property="Background" Value="{DynamicResource ThemeDataGridRowSelectedBackground}" />
4545
</Trigger>
4646
</Style.Triggers>
4747
</Style>
@@ -78,10 +78,10 @@
7878
<ControlTemplate.Triggers>
7979
<!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten -->
8080
<Trigger Property="IsMouseOver" Value="true">
81-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeTextBoxBackground}" />
81+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeTextBoxBackground}" />
8282
</Trigger>
8383
<Trigger Property="IsPressed" Value="true">
84-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollArrowPressed}" />
84+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollArrowPressed}" />
8585
</Trigger>
8686
<Trigger Property="IsEnabled" Value="false">
8787
<Setter Property="Foreground" Value="Black"/>
@@ -118,7 +118,7 @@
118118
<Border Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
119119
<ControlTemplate.Triggers>
120120
<Trigger Property="IsMouseOver" Value="true">
121-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollBarThumbFill}" />
121+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollBarThumbFill}" />
122122
</Trigger>
123123
</ControlTemplate.Triggers>
124124
</ControlTemplate>

‎UnityLauncherPro/UpgradeWindow.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434

3535
<!-- datagrid rows & row selection -->
3636
<Style TargetType="DataGridRow">
37-
<Setter Property="Background" Value="{StaticResource ThemeButtonBackground}" />
37+
<Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}" />
3838
<Setter Property="BorderBrush" Value="{x:Null}" />
3939
<Setter Property="BorderThickness" Value="0,0,0,0" />
4040
<Style.Triggers>
4141
<!--<Trigger Property="IsMouseOver" Value="True">
4242
<Setter Property="Background" Value="{StaticResource DataGridRowMouseOver}"/>
4343
</Trigger>-->
4444
<Trigger Property="IsSelected" Value="True">
45-
<Setter Property="Background" Value="{StaticResource ThemeDataGridRowSelectedBackground}" />
45+
<Setter Property="Background" Value="{DynamicResource ThemeDataGridRowSelectedBackground}" />
4646
</Trigger>
4747
</Style.Triggers>
4848
</Style>
@@ -80,10 +80,10 @@
8080
<ControlTemplate.Triggers>
8181
<!-- NOTE order matters, if pressed is before mouseover, then it gets overwritten -->
8282
<Trigger Property="IsMouseOver" Value="true">
83-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeTextBoxBackground}" />
83+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeTextBoxBackground}" />
8484
</Trigger>
8585
<Trigger Property="IsPressed" Value="true">
86-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollArrowPressed}" />
86+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollArrowPressed}" />
8787
</Trigger>
8888
<Trigger Property="IsEnabled" Value="false">
8989
<Setter Property="Foreground" Value="Black"/>
@@ -120,7 +120,7 @@
120120
<Border Name="Border" CornerRadius="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
121121
<ControlTemplate.Triggers>
122122
<Trigger Property="IsMouseOver" Value="true">
123-
<Setter TargetName="Border" Property="Background" Value="{StaticResource ThemeScrollBarThumbFill}" />
123+
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ThemeScrollBarThumbFill}" />
124124
</Trigger>
125125
</ControlTemplate.Triggers>
126126
</ControlTemplate>

0 commit comments

Comments
 (0)