Merge branch 'develop'

adrianmteo · Mar 21, 2020 · 49b7b5c · 49b7b5c
2 parents 280981f + 5142e99
commit 49b7b5c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 33 deletions.
diff --git a/Luna/Windows/AboutWindow.xaml b/Luna/Windows/AboutWindow.xaml
@@ -5,18 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:Luna.Controls"
         mc:Ignorable="d"
-        Title="About" Width="280" WindowStyle="None" AllowsTransparency="True" Background="{x:Null}"
+        Title="About" Width="250" Background="{DynamicResource ButtonBackgroundBrush}"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
         SnapsToDevicePixels="True" SizeToContent="Height">
 
     <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="45" ResizeBorderThickness="4" CornerRadius="0" NonClientFrameEdges="None" GlassFrameThickness="0" />
+        <WindowChrome CaptionHeight="30" ResizeBorderThickness="4" CornerRadius="0" GlassFrameThickness="-1" />
     </WindowChrome.WindowChrome>
 
-    <Grid Margin="15" Background="{DynamicResource ButtonBackgroundBrush}">
-        <Grid.Effect>
-            <DropShadowEffect BlurRadius="15" Color="Black" Opacity="0.4" ShadowDepth="0" />
-        </Grid.Effect>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition />

diff --git a/Luna/Windows/MessageWindow.xaml b/Luna/Windows/MessageWindow.xaml
@@ -7,22 +7,19 @@
         xmlns:controls="clr-namespace:Luna.Controls"
         xmlns:utils="clr-namespace:Luna.Utils"
         mc:Ignorable="d"
-        Title="Window" Width="380" WindowStyle="None" AllowsTransparency="True" Background="{x:Null}"
+        Title="Window" Width="350" Background="{DynamicResource ButtonBackgroundBrush}"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False"
         SnapsToDevicePixels="True" SizeToContent="Height">
 
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="30" ResizeBorderThickness="4" CornerRadius="0" GlassFrameThickness="-1" />
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
         <utils:ObjectEmptyToVisbility x:Key="ObjectEmptyToVisbility" />
     </Window.Resources>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="45" ResizeBorderThickness="4" CornerRadius="0" NonClientFrameEdges="None" GlassFrameThickness="0" />
-    </WindowChrome.WindowChrome>
-
-    <Grid Margin="15" Background="{DynamicResource ButtonBackgroundBrush}">
-        <Grid.Effect>
-            <DropShadowEffect BlurRadius="15" Color="Black" Opacity="0.4" ShadowDepth="0" />
-        </Grid.Effect>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition />

diff --git a/Luna/Windows/SettingsWindow.xaml b/Luna/Windows/SettingsWindow.xaml
@@ -5,23 +5,20 @@
         xmlns:utils="clr-namespace:Luna.Utils"
         xmlns:models="clr-namespace:Luna.Models"
         xmlns:controls="clr-namespace:Luna.Controls"
-        Title="Luna" Width="380" WindowStyle="None" AllowsTransparency="True" Background="{x:Null}"
+        Title="Luna" Width="350" Background="{DynamicResource ButtonBackgroundBrush}"
         WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" SizeToContent="Height"
         SnapsToDevicePixels="True">
 
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="30" ResizeBorderThickness="4" CornerRadius="0" GlassFrameThickness="-1" />
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <utils:ObjectComparatorToVisbility x:Key="ObjectComparatorToVisbility" />
     </Window.Resources>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="45" ResizeBorderThickness="4" CornerRadius="0" NonClientFrameEdges="None" GlassFrameThickness="0" />
-    </WindowChrome.WindowChrome>
-
-    <Grid Margin="15" Background="{DynamicResource ButtonBackgroundBrush}">
-        <Grid.Effect>
-            <DropShadowEffect BlurRadius="15" Color="Black" Opacity="0.4" ShadowDepth="0" />
-        </Grid.Effect>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition Height="*" />

diff --git a/Luna/Windows/UpdateWindow.xaml b/Luna/Windows/UpdateWindow.xaml
@@ -6,10 +6,14 @@
         xmlns:models="clr-namespace:Luna.Models"
         xmlns:controls="clr-namespace:Luna.Controls"
         mc:Ignorable="d"
-        Title="Update" Width="320" WindowStyle="None" AllowsTransparency="True" Background="{x:Null}"
+        Title="Update" Width="300" Background="{DynamicResource ButtonBackgroundBrush}"
         WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" ShowInTaskbar="False"
         SnapsToDevicePixels="True" SizeToContent="Height">
 
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="30" ResizeBorderThickness="4" CornerRadius="0" GlassFrameThickness="-1" />
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
         <DataTemplate x:Key="CheckingTemplate">
             <StackPanel>
@@ -61,14 +65,7 @@
         </DataTemplate>
     </Window.Resources>
 
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="45" ResizeBorderThickness="4" CornerRadius="0" NonClientFrameEdges="None" GlassFrameThickness="0" />
-    </WindowChrome.WindowChrome>
-
-    <Grid Margin="15" Background="{DynamicResource ButtonBackgroundBrush}">
-        <Grid.Effect>
-            <DropShadowEffect BlurRadius="15" Color="Black" Opacity="0.4" ShadowDepth="0" />
-        </Grid.Effect>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition />