Fix

shi-jianyu · Oct 16, 2021 · b1e9231 · b1e9231
1 parent c43bddf
commit b1e9231
Show file tree

Hide file tree

Showing 9 changed files with 197 additions and 164 deletions.
diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm
diff --git a/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml b/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        d:DesignWidth="1200" Width="840" MinWidth="800"
+        d:DesignWidth="1200" Width="830" MinWidth="800"
         d:DesignHeight="600" Height="600" MinHeight="500"
         xmlns:local="using:System.Application.UI.Views"
         xmlns:vm="using:System.Application.UI.ViewModels"

diff --git a/...Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_GlobalConfigPage.axaml b/...Desktop.Avalonia/Application/UI/Views/Pages/ArchiSteamFarmPlus/ASF_GlobalConfigPage.axaml
@@ -17,43 +17,50 @@
              x:DataType="vm:ArchiSteamFarmPlusPageViewModel"
              x:CompileBindings="True"
              x:Class="System.Application.UI.Views.Pages.ASF_GlobalConfigPage">
-  <StackPanel Classes="Settings">
-    <Border Classes="Item">
-      <StackPanel Spacing="10" VerticalAlignment="Center">
-        <WrapPanel>
+  <ScrollViewer>
+    <StackPanel Classes="Settings">
+      <Border Classes="Item">
+        <WrapPanel VerticalAlignment="Center">
           <TextBlock Text="当前 ArchiSteamFarm 版本 :  " VerticalAlignment="Center"></TextBlock>
           <TextBlock Text="{ReflectionBinding Source={x:Static service:IArchiSteamFarmService.Instance},Path=CurrentVersion,Mode=OneWay}" VerticalAlignment="Center"></TextBlock>
         </WrapPanel>
-        <!--<TextBlock Text="最新 ArchiSteamFarm 版本 :  " VerticalAlignment="Center"></TextBlock>
-          <TextBlock Text="{ReflectionBinding Source={x:Static ms:ASFSettings.ArchiSteamFarmExePath},Path=Value,Mode=OneWay}" VerticalAlignment="Center"></TextBlock>-->
-      </StackPanel>
-    </Border>
+      </Border>
 
-    <Separator Classes="Separator"/>
+      <Border Classes="Item">
+        <DockPanel>
+          <TextBlock Text="程序启动时自动运行ASF"/>
+          <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:ASFSettings.AutoRunArchiSteamFarm},Path=Value,Mode=TwoWay}" />
+        </DockPanel>
+      </Border>
 
-    <Border Classes="Item">
-      <DockPanel>
-        <TextBlock Text="程序启动时自动运行ASF"/>
-        <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:ASFSettings.AutoRunArchiSteamFarm},Path=Value,Mode=TwoWay}" />
-      </DockPanel>
-    </Border>
+      <Separator Classes="Separator"/>
 
-    <Border Classes="Item">
-      <DockPanel>
-        <TextBlock Text="启用IPC"/>
-        <ToggleSwitch />
-      </DockPanel>
-    </Border>
+      <Border Classes="Item">
+        <DockPanel>
+          <TextBlock Text="启用IPC"/>
+          <ToggleSwitch />
+        </DockPanel>
+      </Border>
 
-    <Border Classes="Item">
-      <DockPanel>
-        <TextBlock Text="IPC服务访问密码"/>
-        <TextBox PasswordChar="●"
-                 Classes="revealPasswordButton">
-        </TextBox>
-      </DockPanel>
-    </Border>
+      <Border Classes="Item">
+        <DockPanel>
+          <TextBlock Text="IPC监听地址"/>
+          <TextBox
+                   Classes="clearButton">
+          </TextBox>
+        </DockPanel>
+      </Border>
 
-    <Separator Classes="Separator"/>
-  </StackPanel>
+      <Border Classes="Item">
+        <DockPanel>
+          <TextBlock Text="IPC服务访问密码"/>
+          <TextBox PasswordChar="●"
+                   Classes="revealPasswordButton">
+          </TextBox>
+        </DockPanel>
+      </Border>
+
+      <Separator Classes="Separator"/>
+    </StackPanel>
+  </ScrollViewer>
 </UserControl>
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
@@ -149,6 +149,8 @@
         <ListBox x:Name="items"
                  Classes="metro"
                  Width="350"
+                 CornerRadius="{StaticResource PaperRadius}"
+                 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}"
                  ScrollViewer.VerticalScrollBarVisibility="Auto"
@@ -251,8 +253,8 @@
       <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" Spacing="30" Margin="0 20">
         <Border Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="10">
           <DockPanel MinWidth="300">
-            <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_AccelerationsEnable,Mode=OneWay,Source={x:Static resx:R.Current}}" 
-                       FontSize="16" 
+            <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_AccelerationsEnable,Mode=OneWay,Source={x:Static resx:R.Current}}"
+                       FontSize="16"
                        Margin="0 0 0 10"
                        DockPanel.Dock="Top"></TextBlock>
             <ScrollViewer>
@@ -275,8 +277,8 @@
         <Border Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="10"
                 IsVisible="{Binding Source={x:Static service:ProxyService.Current},Path=IsEnableScript}">
           <DockPanel MinWidth="300">
-            <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_ScriptsEnable,Mode=OneWay,Source={x:Static resx:R.Current}}" 
-                       FontSize="16" 
+            <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_ScriptsEnable,Mode=OneWay,Source={x:Static resx:R.Current}}"
+                       FontSize="16"
                        Margin="0 0 0 10"
                        DockPanel.Dock="Top"></TextBlock>
             <ScrollViewer>

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
@@ -310,7 +310,8 @@
               Padding="10">
           <ItemsRepeater x:Name="Apps" Items="{Binding SteamApps}">
             <ItemsRepeater.Layout>
-              <UniformGridLayout MinRowSpacing="20"
+              <UniformGridLayout ItemsJustification="SpaceEvenly"
+                                 MinRowSpacing="20"
                                  MinColumnSpacing="10"/>
             </ItemsRepeater.Layout>
             <ItemsRepeater.ItemTemplate>

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml
@@ -106,7 +106,8 @@
                      Padding="10 0 10 10">
         <ItemsRepeater Items="{Binding Authenticators,Mode=OneWay}">
           <ItemsRepeater.Layout>
-            <UniformGridLayout MinRowSpacing="10"
+            <UniformGridLayout ItemsJustification="SpaceEvenly"
+                               MinRowSpacing="10"
                                MinColumnSpacing="10"/>
             <!--<WrapLayout HorizontalSpacing="10"
                       VerticalSpacing="10" Orientation="Horizontal"/>-->
@@ -221,7 +222,9 @@
                       <PathIcon Data="{DynamicResource CopyDrawing}" Width="20"></PathIcon>
                     </Button>-->
 
-                      <Button Cursor="Hand" Classes="flatbutton" Command="{ReflectionBinding #u.DataContext.ShowSteamAuthTrade}" CommandParameter="{Binding}"
+                      <Button Cursor="Hand" Classes="flatbutton" 
+                              Command="{ReflectionBinding #u.DataContext.ShowSteamAuthTrade}" 
+                              CommandParameter="{Binding}"
                               ToolTip.Tip="{ReflectionBinding Path=Res.LocalAuth_AuthTrade,Mode=OneWay,Source={x:Static resx:R.Current}}" >
                         <PathIcon Data="{DynamicResource TradeDrawing}" Width="20"></PathIcon>
                       </Button>