From 2fce4e828fed9dda52b266998831a7d75d5bb0ef Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Sun, 28 Nov 2021 06:41:54 +0800
Subject: [PATCH] Style

---
 .../UI/Styles/Controls/TabControl.xaml        | 173 +++++++++---------
 .../UI/Views/Pages/GameListPage.axaml         |   4 +-
 src/ST.Client/Settings/ProxySettings.cs       |  17 +-
 3 files changed, 103 insertions(+), 91 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml
index 3df1dd63c..c5731d150 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml
@@ -1,96 +1,103 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Design.PreviewWith>
-    <Border Padding="20" Background="White">
-      <Border Padding="20" Classes="paper">
-        <TextBox Text="Code Font Family"/>
-      </Border>
-    </Border>
-  </Design.PreviewWith>
+<Styles
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="using:FluentAvalonia.UI.Controls">
+    <Design.PreviewWith>
+        <Border Padding="20" Background="White">
+            <Border Padding="20" Classes="paper">
+                <TextBox Text="Code Font Family" />
+            </Border>
+        </Border>
+    </Design.PreviewWith>
 
-  <Style Selector="TabControl.flat">
-    <Setter Property="Padding" Value="0"></Setter>
-  </Style>
-  <Style Selector="TabControl.flat TabItem">
-    <Setter Property="FontSize" Value="16"></Setter>
-    <Setter Property="MinHeight" Value="36"></Setter>
-  </Style>
-  <Style Selector="TabControl.flat /template/ DockPanel">
-    <Setter Property="Margin" Value="0 -10 0 0"></Setter>
-  </Style>
-  <!--<Style Selector="TabControl.flat /template/ ItemsPresenter">
+    <Style Selector="TabControl.flat">
+        <Setter Property="Padding" Value="0" />
+    </Style>
+    <Style Selector="TabControl.flat TabItem">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="MinHeight" Value="36" />
+    </Style>
+    <Style Selector="TabControl.flat /template/ DockPanel">
+        <Setter Property="Margin" Value="0 -10 0 0" />
+    </Style>
+    <!--<Style Selector="TabControl.flat /template/ ItemsPresenter">
     <Setter Property="Margin" Value="{StaticResource PageMargin}"></Setter>
   </Style>-->
 
 
-  <Style Selector="TabControl TabItem">
-    <Setter Property="FontSize" Value="16"></Setter>
-  </Style>
+    <Style Selector="TabControl TabItem">
+        <Setter Property="FontSize" Value="16" />
+    </Style>
 
-  <Style Selector="TabControl.NavBar">
-    <Setter Property="TabStripPlacement" Value="Left"/>
-    <Setter Property="Padding" Value="0 0 0 0"/>
-    <Setter Property="Background" Value="{x:Null}"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border
-            Margin="{TemplateBinding Margin}"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}">
-          <DockPanel>
-            <ScrollViewer Width="240" Margin="0 60 0 0"
-                Name="PART_ScrollViewer"
-                HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-                Background="{TemplateBinding Background}"
-                DockPanel.Dock="Left">
-              <ItemsPresenter
-                  Name="PART_ItemsPresenter"
-                  Items="{TemplateBinding Items}"
-                  ItemsPanel="{TemplateBinding ItemsPanel}"
-                  ItemTemplate="{TemplateBinding ItemTemplate}">
-              </ItemsPresenter>
-            </ScrollViewer>
-            <ContentControl Content="{TemplateBinding Tag}" HorizontalContentAlignment="Right" DockPanel.Dock="Bottom"/>
-            <!--<ScrollViewer Background="{x:Null}"
+    <Style Selector="TabControl.NavBar">
+        <Setter Property="TabStripPlacement" Value="Left" />
+        <Setter Property="Padding" Value="0 0 0 0" />
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    Margin="{TemplateBinding Margin}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+                    <DockPanel>
+                        <ScrollViewer
+                            Name="PART_ScrollViewer"
+                            Width="240"
+                            Margin="0,60,0,0"
+                            Background="{TemplateBinding Background}"
+                            DockPanel.Dock="Left"
+                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                            <ItemsPresenter
+                                Name="PART_ItemsPresenter"
+                                ItemTemplate="{TemplateBinding ItemTemplate}"
+                                Items="{TemplateBinding Items}"
+                                ItemsPanel="{TemplateBinding ItemsPanel}" />
+                        </ScrollViewer>
+                        <ContentControl
+                            HorizontalContentAlignment="Right"
+                            Content="{TemplateBinding Tag}"
+                            DockPanel.Dock="Bottom" />
+                        <!--<ScrollViewer Background="{x:Null}"
                 HorizontalScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem.(ScrollViewer.HorizontalScrollBarVisibility)}"
                 VerticalScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem.(ScrollViewer.VerticalScrollBarVisibility)}">-->
-            <ContentPresenter
-                    Name="PART_SelectedContentHost"
-                    Margin="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Content="{TemplateBinding SelectedContent}"
-                    ContentTemplate="{TemplateBinding SelectedContentTemplate}">
-            </ContentPresenter>
-            <!--</ScrollViewer>-->
-          </DockPanel>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
+                        <ContentPresenter
+                            Name="PART_SelectedContentHost"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding SelectedContent}"
+                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                        <!--</ScrollViewer>-->
+                    </DockPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
 
-  <Style Selector="TabControl.NavBar > TabItem">
-    <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="FontSize" Value="14"/>
-    <Setter Property="Margin" Value="0"/>
-    <Setter Property="Padding" Value="16"/>
-    <Setter Property="Width" Value="240" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="(ScrollViewer.HorizontalScrollBarVisibility)" Value="Auto"/>
-    <Setter Property="(ScrollViewer.VerticalScrollBarVisibility)" Value="Auto"/>
-  </Style>
+    <Style Selector="TabControl.NavBar &gt; TabItem">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="16" />
+        <Setter Property="Width" Value="240" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="(ScrollViewer.HorizontalScrollBarVisibility)" Value="Auto" />
+        <Setter Property="(ScrollViewer.VerticalScrollBarVisibility)" Value="Auto" />
+    </Style>
 
-  <Style Selector="TabControl.NavBar > TabItem:selected /template/ Border#PART_SelectedPipe">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-  <Style Selector="TabControl.NavBar > TabItem:selected">
-    <Setter Property="Background" Value="#1fffffff"/>
-  </Style>
-
-  <Style Selector="TabControl.NavBar > TabItem:pointerover /template/ Border#PART_LayoutRoot">
-    <Setter Property="Background" Value="#3fffffff"/>
-  </Style>
+    <Style Selector="TabControl.NavBar &gt; TabItem:selected /template/ Border#PART_SelectedPipe">
+        <Setter Property="IsVisible" Value="False" />
+    </Style>
+    <Style Selector="TabControl.NavBar &gt; TabItem:selected">
+        <Setter Property="Background" Value="#1fffffff" />
+    </Style>
 
+    <Style Selector="TabControl.NavBar &gt; TabItem:pointerover /template/ Border#PART_LayoutRoot">
+        <Setter Property="Background" Value="#3fffffff" />
+    </Style>
 
+    <Style Selector="ui|CommandBar:labelbottom /template/ Popup#OverflowPopup">
+        <Setter Property="VerticalOffset" Value="16" />
+    </Style>
 </Styles>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
index bd181ccc2..f8371f28f 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
@@ -267,7 +267,7 @@
               </ui:CommandBarButton.Icon>
             </ui:CommandBarButton>
 
-            <ui:CommandBarButton
+            <!--<ui:CommandBarButton
                        IsVisible="{x:Static sys:OperatingSystem2.IsWindows}"
                        Command="{Binding IdleAppCommand}"
                        ToolTip.Tip="{ReflectionBinding Path=Res.GameList_IdleGamesManger,Mode=OneWay,Source={x:Static resx:R.Current}}"
@@ -275,7 +275,7 @@
               <ui:CommandBarButton.Icon>
                 <ui:PathIcon Data="{StaticResource TopSpeedDrawing}"/>
               </ui:CommandBarButton.Icon>
-            </ui:CommandBarButton>
+            </ui:CommandBarButton>-->
 
             <!--<ui:CommandBarButton
                        Command="{Binding SteamShutdownCommand}"
diff --git a/src/ST.Client/Settings/ProxySettings.cs b/src/ST.Client/Settings/ProxySettings.cs
index 3dee67fdd..0fbddf737 100644
--- a/src/ST.Client/Settings/ProxySettings.cs
+++ b/src/ST.Client/Settings/ProxySettings.cs
@@ -20,12 +20,6 @@ namespace System.Application.Settings
         public static SerializableProperty<bool> IsEnableScript { get; }
             = GetProperty(defaultValue: false, autoSave: true);
 
-        /// <summary>
-        /// 程序启动时自动启动代理
-        /// </summary>
-        public static SerializableProperty<bool> ProgramStartupRunProxy { get; }
-            = GetProperty(defaultValue: false, autoSave: true);
-
         /// <summary>
         /// 代理服务启用状态
         /// </summary>
@@ -40,6 +34,12 @@ namespace System.Application.Settings
 
         #region 代理设置
 
+        /// <summary>
+        /// 程序启动时自动启动代理
+        /// </summary>
+        public static SerializableProperty<bool> ProgramStartupRunProxy { get; }
+            = GetProperty(defaultValue: false, autoSave: true);
+
         /// <summary>
         /// 系统代理模式端口
         /// </summary>
@@ -58,6 +58,11 @@ namespace System.Application.Settings
         public static SerializableProperty<bool> OnlyEnableProxyScript { get; }
             = GetProperty(defaultValue: false, autoSave: false);
 
+        /// <summary>
+        /// 代理时使用的解析主DNS
+        /// </summary>
+        public static SerializableProperty<string> ProxyMasterDns { get; }
+            = GetProperty(defaultValue: "", autoSave: false);
         #endregion
 
         #region 本地代理设置