Working on design

dunk8888 · Aug 10, 2017 · 8c39092 · 8c39092
1 parent 9ae1160
commit 8c39092
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/HueHue/HueHue.csproj b/HueHue/HueHue.csproj
@@ -84,6 +84,9 @@
     <Compile Include="Helpers\Effects.cs" />
     <Compile Include="Helpers\MusicSpectrum.cs" />
     <Compile Include="Helpers\SpectrumBase.cs" />
+    <Compile Include="SettingsWindow.xaml.cs">
+      <DependentUpon>SettingsWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\FixedColors.xaml.cs">
       <DependentUpon>FixedColors.xaml</DependentUpon>
     </Compile>
@@ -102,6 +105,10 @@
     <Compile Include="Views\SnakeMode.xaml.cs">
       <DependentUpon>SnakeMode.xaml</DependentUpon>
     </Compile>
+    <Page Include="SettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\FixedColors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/HueHue/MainWindow.xaml b/HueHue/MainWindow.xaml
@@ -3,9 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:HueHue"
         mc:Ignorable="d"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"

diff --git a/HueHue/SettingsWindow.xaml b/HueHue/SettingsWindow.xaml
@@ -3,10 +3,23 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:HueHue"
         mc:Ignorable="d"
-        Title="SettingsWindow" Height="300" Width="300">
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="Segoe UI Light"
+        Title="SettingsWindow" Height="600" Width="600">
     <Grid>
-
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="73*"/>
+            <ColumnDefinition Width="520*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40*"/>
+            <RowDefinition Height="233*"/>
+        </Grid.RowDefinitions>
+        <materialDesign:ColorZone Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2" Mode="PrimaryMid" VerticalAlignment="Stretch" Content="Settings" Margin="0,0,0,10" Grid.ColumnSpan="2"/>
+
     </Grid>
 </Window>