ui

mili-tan · Apr 15, 2019 · 6b7dfb1 · 6b7dfb1
1 parent 8f331be
commit 6b7dfb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/AuroraGUI/Forms/MainWindow.xaml b/AuroraGUI/Forms/MainWindow.xaml
@@ -50,6 +50,12 @@
                     VerticalAlignment="Center"
                     ToolTip="启用 / 停用"
                     DockPanel.Dock="Right" HorizontalAlignment="Right" Checked="DnsEnable_Checked" Unchecked="DnsEnable_Unchecked" />
+
+                    <Button 
+                            HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" 
+                            Margin="0,-0.5,1,0" Height="Auto"  ToolTip="最小化" Click="MinimizedNormal">
+                        <materialDesign:PackIcon Kind="WindowMinimize" Opacity="0.9" />
+                    </Button>
                 </DockPanel>
             </materialDesign:ColorZone>
             <Grid Name="ControlGrid" Margin="47,67,47,57" Grid.ColumnSpan="2" Grid.Column="0" Opacity="0.95">

diff --git a/AuroraGUI/Forms/MainWindow.xaml.cs b/AuroraGUI/Forms/MainWindow.xaml.cs
@@ -172,8 +172,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             }
 
             var desktopWorkingArea = SystemParameters.WorkArea;
-            Left = desktopWorkingArea.Right - Width - 10;
-            Top = desktopWorkingArea.Bottom - Height - 10;
+            Left = desktopWorkingArea.Right - Width - 5;
+            Top = desktopWorkingArea.Bottom - Height - 5;
 
             FadeIn(0.2);
             Visibility = Visibility.Visible;

diff --git a/AuroraGUI/Forms/SettingsWindow.xaml b/AuroraGUI/Forms/SettingsWindow.xaml
@@ -33,8 +33,8 @@
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,10,12,18" HorizontalAlignment="Right" Grid.RowSpan="2">
                     <Button Click="CleanCache_OnClick"
                             HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" 
-                            Margin="0,-5,0,-6" Height="Auto" Opacity="0.5">
-                        <materialDesign:PackIcon Kind="Broom" ToolTip="刷新 DNS 缓存" Height="19" />
+                            Margin="0,-5,0,-6" Height="Auto" Opacity="0.5" ToolTip="刷新 DNS 缓存">
+                        <materialDesign:PackIcon Kind="Broom" Height="19" />
                     </Button>
                 </StackPanel>
 
@@ -59,8 +59,8 @@
                 <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="16 0 16 8" HorizontalAlignment="Right">
                     <Button Name="RunAsAdmin" Click="RunAsAdmin_OnClick" Visibility="Collapsed"
                         HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" 
-                        Margin="0,2,2,-8.2" Height="Auto">
-                        <materialDesign:PackIcon Kind="ShieldOutline" ToolTip="以管理员权限运行" />
+                        Margin="0,2,2,-8.2" Height="Auto" ToolTip="以管理员权限运行">
+                        <materialDesign:PackIcon Kind="ShieldOutline"/>
                     </Button>
                     <ToggleButton Name="RunWithStart" 
                                   Style="{StaticResource MaterialDesignSwitchToggleButton}"
@@ -88,8 +88,8 @@
                 <StackPanel Grid.Row="8" Orientation="Horizontal" Margin="16 0 16 8" HorizontalAlignment="Right">
                     <Button Click="WhiteListButton_OnClick"
                             HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" 
-                            Margin="0,0,2,1" Height="Auto">
-                        <materialDesign:PackIcon Kind="FileImport" ToolTip="导入" />
+                            Margin="0,0,2,1" Height="Auto" ToolTip="导入">
+                        <materialDesign:PackIcon Kind="FileImport" Opacity="0.8" />
                     </Button>
                     <ToggleButton Name="WhiteList" IsEnabled="False"
                         Style="{StaticResource MaterialDesignSwitchToggleButton}" Height="25" Margin="0,0,0,-0.2" VerticalAlignment="Top"