add theme-based dictionaries for brushes; move some MainWindow proper…

…ties to the base Window style
tera-arise · Jan 15, 2024 · 9215bd4 · 9215bd4
1 parent 0b409ae
commit 9215bd4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/src/client/Launcher/LauncherApplication.axaml b/src/client/Launcher/LauncherApplication.axaml
@@ -5,7 +5,24 @@
     <Application.Styles>
         <FluentTheme />
         <icons:MaterialIconStyles />
-
         <StyleInclude Source="/Launcher/Styles/Window.axaml" />
     </Application.Styles>
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="WindowBackground" Color="#eee"/>
+                    <SolidColorBrush x:Key="CloseButtonPointerOverBackground" Color="Red"/>
+                    <SolidColorBrush x:Key="CloseButtonPressedBackground" Color="DarkRed"/>
+                    <SolidColorBrush x:Key="DefaultButtonBackground" Color="#1000"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="WindowBackground" Color="#222"/>
+                    <SolidColorBrush x:Key="CloseButtonPointerOverBackground" Color="DarkRed"/>
+                    <SolidColorBrush x:Key="CloseButtonPressedBackground" Color="Red"/>
+                    <SolidColorBrush x:Key="DefaultButtonBackground" Color="#1fff"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
diff --git a/src/client/Launcher/Styles/Window.axaml b/src/client/Launcher/Styles/Window.axaml
@@ -9,6 +9,8 @@
         <Setter Property="CanResize" Value="False" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="25" />
-        <Setter Property="Padding" Value="25, 50, 25, 25" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Background" Value="{DynamicResource WindowBackground}" />
     </Style>
 </Styles>
diff --git a/src/client/Launcher/Windows/MainWindow.axaml b/src/client/Launcher/Windows/MainWindow.axaml
@@ -6,21 +6,17 @@
         x:DataType="controllers:MainController"
         Width="1280"
         Height="720"
-        Padding="0"
-        CanResize="False"
-        ExtendClientAreaToDecorationsHint="True"
-        ExtendClientAreaChromeHints="NoChrome"
-        Background="#222222"
-        RequestedThemeVariant="Dark">
+        RequestedThemeVariant="Dark"
+        >
     <Window.Styles>
         <Style Selector="#CloseButton:pointerover /template/ ContentPresenter">
-            <Setter Property="Background" Value="DarkRed" />
+            <Setter Property="Background" Value="{DynamicResource CloseButtonPointerOverBackground}" />
         </Style>
         <Style Selector="#CloseButton:pressed /template/ ContentPresenter">
-            <Setter Property="Background" Value="Red" />
+            <Setter Property="Background" Value="{DynamicResource CloseButtonPressedBackground}" />
         </Style>
         <Style Selector="Button">
-            <Setter Property="Background" Value="#1fff" />
+            <Setter Property="Background" Value="{DynamicResource DefaultButtonBackground}" />
             <Setter Property="CornerRadius" Value="8" />
         </Style>
     </Window.Styles>