From 09a4e8b5dda7ccfa4c3579f65faeb0757dfaf347 Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Fri, 18 Feb 2022 18:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86UI=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/UI/Styles/Controls/TabControl.xaml    |  3 ---
 .../UI/Views/Pages/CommunityProxyPage.axaml           | 11 ++++-------
 src/ST.Client/Settings/ProxySettings.cs               |  2 +-
 3 files changed, 5 insertions(+), 11 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 c5731d150..b00a0b696 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
@@ -97,7 +97,4 @@
         <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/CommunityProxyPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
index 95e66d347..c2c460ef6 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml
@@ -131,7 +131,7 @@
               </ui:CommandBarButton.Icon>
             </ui:CommandBarButton>
             <ui:CommandBarSeparator/>
-            
+
             <ui:CommandBarButton
          Command="{Binding EditHostsFileCommand}"
          Label="{ReflectionBinding Path=Res.CommunityFix_EditHostsFile,Mode=OneWay,Source={x:Static resx:R.Current}}">
@@ -153,7 +153,7 @@
                 <ui:PathIcon Data="{StaticResource DocumentEditDrawing}"/>
               </ui:CommandBarButton.Icon>
             </ui:CommandBarButton>
-          
+
           </ui:CommandBar.SecondaryCommands>
         </ui:CommandBar>
       </Border>
@@ -170,11 +170,11 @@
                  ClipToBounds="True"
                  Items="{ReflectionBinding Source={x:Static service:ProxyService.Current},Path=ProxyDomainsList,Mode=OneWay}"
                  SelectedItem="{ReflectionBinding Source={x:Static service:ProxyService.Current},Path=SelectGroup,Mode=TwoWay}"
+                 VirtualizationMode="None"
+                 AutoScrollToSelectedItem="True"
                  Background="Transparent">
           <ListBox.ItemTemplate>
             <DataTemplate>
-              <!--<Border Classes="paper" Background="{DynamicResource ThemeBrushKey}">-->
-              <!--<StackPanel>-->
               <StackPanel Orientation="Horizontal"
                          Margin="20 15">
                 <CheckBox Classes="onlyCheckBox"
@@ -192,9 +192,6 @@
                                              Margin="20 0 0 0">
                 </controls:ScrollingTextBlock>
               </StackPanel>
-              <!--<Separator Classes="Separator"  />-->
-              <!--</StackPanel>-->
-              <!--</Border>-->
             </DataTemplate>
           </ListBox.ItemTemplate>
         </ListBox>
diff --git a/src/ST.Client/Settings/ProxySettings.cs b/src/ST.Client/Settings/ProxySettings.cs
index b71310cb3..dd8c1803a 100644
--- a/src/ST.Client/Settings/ProxySettings.cs
+++ b/src/ST.Client/Settings/ProxySettings.cs
@@ -63,7 +63,7 @@ namespace System.Application.Settings
         /// 代理时使用的解析主DNS
         /// </summary>
         public static SerializableProperty<string?> ProxyMasterDns { get; }
-            = GetProperty<string?>(defaultValue: IDnsAnalysisService.PrimaryDNS_Ali, autoSave: false);
+            = GetProperty<string?>(defaultValue: "System Default", autoSave: false);
         #endregion
 
         #region 本地代理设置