undo static resource change, didn't seem to do anything

Brian0255 · Feb 3, 2025 · 00a67c5 · 00a67c5
1 parent 22c1f01
commit 00a67c5
Show file tree

Hide file tree

Showing 8 changed files with 275 additions and 275 deletions.
diff --git a/TrackOMatic/BroadcastView.xaml b/TrackOMatic/BroadcastView.xaml
diff --git a/TrackOMatic/CollectibleItem.xaml b/TrackOMatic/CollectibleItem.xaml
@@ -14,7 +14,7 @@
         </Grid.ColumnDefinitions>
         <Viewbox Name="CountViewbox" Grid.Row="1" Grid.Column="9" Visibility="Hidden" Panel.ZIndex="2">
             <Grid Background="{Binding BGColor}">
-                <TextBlock Margin="3,-1,2,0" x:Name="count" Text="{Binding Text}" Foreground="#FFFFFF" FontFamily="{StaticResource DK64Font}" />
+                <TextBlock Margin="3,-1,2,0" x:Name="count" Text="{Binding Text}" Foreground="#FFFFFF" FontFamily="{DynamicResource DK64Font}" />
             </Grid>
         </Viewbox>
         <Image Source="{Binding ImageSource}" x:Name="image" Margin="2" Grid.Row="0" Grid.RowSpan="2" Grid.ColumnSpan="2"

diff --git a/TrackOMatic/HintsUI/BLockerPanel.xaml b/TrackOMatic/HintsUI/BLockerPanel.xaml
@@ -14,7 +14,7 @@
                     <RowDefinition Height="26"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-                <TextBlock Margin="10,0,0,0" Padding="0,0,0,2" FontSize="20" Foreground="White" Grid.Row="0"  FontFamily="{StaticResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center"/>
+                <TextBlock Margin="10,0,0,0" Padding="0,0,0,2" FontSize="20" Foreground="White" Grid.Row="0"  FontFamily="{DynamicResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center"/>
                 <Border CornerRadius="1" Grid.Row="1" Margin="0" BorderThickness="0" BorderBrush="Black" Background="{StaticResource RegionImageBG}">
                     <UniformGrid Name="MainGrid" Grid.Row="1" Columns="2">
                         <local:BLockerHint RegionName="JUNGLE_JAPES"/>

diff --git a/TrackOMatic/HintsUI/HelmDoorPanel.xaml b/TrackOMatic/HintsUI/HelmDoorPanel.xaml
@@ -14,7 +14,7 @@
                     <RowDefinition Height="26"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-                <TextBlock Margin="10,0,0,0" Padding="0,0,0,2" FontSize="20" Foreground="White" Grid.Row="0"  FontFamily="{StaticResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center"/>
+                <TextBlock Margin="10,0,0,0" Padding="0,0,0,2" FontSize="20" Foreground="White" Grid.Row="0"  FontFamily="{DynamicResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center"/>
                 <Border CornerRadius="1" Grid.Row="1" Margin="0" BorderThickness="0" BorderBrush="Black" Background="{StaticResource RegionImageBG}">
                     <UniformGrid Name="MainGrid" Grid.Row="1" Columns="2">
                         <local:HelmDoorHint LabelText="Door 1:"/>

diff --git a/TrackOMatic/HintsUI/HintItemSelectionDialog.xaml b/TrackOMatic/HintsUI/HintItemSelectionDialog.xaml
diff --git a/TrackOMatic/HintsUI/HintPanel.xaml b/TrackOMatic/HintsUI/HintPanel.xaml
@@ -21,7 +21,7 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width=".1*"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Margin="10,0,0,0" FontSize="18" Foreground="White" FontFamily="{StaticResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center" Padding="0,0,0,2"/>
+                    <TextBlock Grid.Column="0" Margin="10,0,0,0" FontSize="18" Foreground="White" FontFamily="{DynamicResource DK64Font}" Text="{Binding Heading}" VerticalAlignment="Center" Padding="0,0,0,2"/>
                     <Image Name="FilterButton" Grid.Column="1" Source="../Images/dk64/filter_empty.png" HorizontalAlignment="Center" Margin="2,2,2,3" MouseDown="FilterButton_MouseDown" Cursor="Hand" Visibility="Hidden"/>
                     <Image Name="SortButton" Grid.Column="2" Source="../Images/dk64/sort.png" HorizontalAlignment="Center" Margin="2,2,2,3" MouseDown="SortButton_MouseDown" Cursor="Hand" Visibility="Hidden"/>
                 </Grid>

diff --git a/TrackOMatic/LevelOrderNumber.xaml b/TrackOMatic/LevelOrderNumber.xaml
@@ -14,7 +14,7 @@
         <Grid Grid.Row="0" Grid.Column="0" Margin="0,0,0,0">
             <Border CornerRadius="3" Margin="0" Background="{StaticResource BaseBG}">
                 <Viewbox>
-                <TextBlock  Margin="1,-2,1,1" x:Name="NumberLabel" Panel.ZIndex="2" FontSize="{StaticResource BigFontSize}"   Foreground="White"  FontFamily="{StaticResource DK64Font}" Text="?"/>
+                <TextBlock  Margin="1,-2,1,1" x:Name="NumberLabel" Panel.ZIndex="2" FontSize="{StaticResource BigFontSize}"   Foreground="White"  FontFamily="{DynamicResource DK64Font}" Text="?"/>
                 </Viewbox>
             </Border>
         </Grid>

diff --git a/TrackOMatic/MainWindow.xaml b/TrackOMatic/MainWindow.xaml