优化桌面端无用菜单和地磅数据可手动功能。

yy-admin-master/YY.Admin/Views/LoginWindow.xaml

@@ -6,6 +6,7 @@
            xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
            xmlns:consts="clr-namespace:YY.Admin.Core.Const;assembly=YY.Admin.Core"
            xmlns:ctls="clr-namespace:YY.Admin.Core.Controls;assembly=YY.Admin.Core"
+           xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
            prism:ViewModelLocator.AutoWireViewModel="True"
            Icon="/Resources/Icon/logo.ico"
            Title="{Binding Title}"
@@ -17,6 +18,28 @@
            KeyDown="Window_KeyDown"
            FontSize="{StaticResource FontSize }">
 
+    <hc:Window.NonClientAreaContent>
+        <!-- 与最小化/关闭同一标题栏行，靠右紧贴系统按钮左侧 -->
+        <Grid HorizontalAlignment="Stretch">
+            <Button
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Margin="0,0,2,0"
+                Width="34"
+                Height="26"
+                Padding="0"
+                Background="Transparent"
+                BorderThickness="0"
+                Cursor="Hand"
+                Focusable="False"
+                shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                Command="{Binding OpenServerSettingsCommand}"
+                ToolTip="服务器设置">
+                <ctls:FontAwesomeIcon Icon="&#xf013;" IconFamily="Solid" Foreground="{DynamicResource PrimaryTextBrush}"/>
+            </Button>
+        </Grid>
+    </hc:Window.NonClientAreaContent>
+
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -38,16 +61,6 @@
 
         <Border Grid.Column="1">
             <Grid>
-                <Button
-                    Command="{Binding OpenServerSettingsCommand}"
-                    Width="34"
-                    Height="34"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Top"
-                    Margin="0,8,8,0"
-                    ToolTip="服务器设置">
-                    <ctls:FontAwesomeIcon Icon="&#xf013;" IconFamily="Solid"/>
-                </Button>
                 <StackPanel Margin="20 0 20 20">
                 <!-- Logo和标题 -->
                 <StackPanel HorizontalAlignment="Center" Margin="0,20,0,40">