Refactor file version paging and UI in AddFileInfoControl

Coloryr · Coloryr · commit d41a855669d1 · 2025-12-01T14:32:50.000+08:00
[AI] Reworks the file version paging logic by renaming and consolidating properties, introducing HaveNextVersionPage and HaveLastVersionPage, and updating commands for page navigation. Updates the AddFileInfoControl UI to improve layout, add scroll-to-home behavior on item info display, and synchronize with the new paging logic. Minor UI adjustments and cleanup are also included.
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml
@@ -87,10 +87,10 @@
                     <svg:SvgControl Path="/Resource/Icon/close.svg" />
                 </Button>
             </Panel>
-            <TabControl Margin="5,0,5,10" SelectedIndex="{Binding SelectIndex}">
+            <TabControl Padding="0" SelectedIndex="{Binding SelectIndex, FallbackValue=1}">
                 <TabItem Header="{setting:Localize AddModPackWindow.Text36}">
-                    <ScrollViewer HorizontalScrollBarVisibility="Disabled">
-                        <StackPanel Margin="10" DataContext="{Binding Last}">
+                    <ScrollViewer Name="ScrollViewer1" HorizontalScrollBarVisibility="Disabled">
+                        <StackPanel Margin="20,10,20,0" DataContext="{Binding Last}">
                             <ItemsControl ItemsSource="{Binding Tags}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
@@ -122,33 +122,58 @@
                     </ScrollViewer>
                 </TabItem>
                 <TabItem Header="{setting:Localize AddModPackWindow.Text35}">
-                    <ScrollViewer>
-                        <StackPanel Name="ModPackFiles" Margin="10">
-                            <WrapPanel Margin="15,15,5,5" DockPanel.Dock="Top">
-                                <DockPanel MinWidth="190" Margin="0,0,10,10">
-                                    <TextBlock Margin="0,0,5,0" Text="{setting:Localize Text.GameVersion}" />
-                                    <ComboBox
-                                        Height="30"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Center"
-                                        ItemsSource="{Binding GameVersionList}"
-                                        SelectedItem="{Binding GameVersionDownload}" />
-                                </DockPanel>
-                                <DockPanel MinWidth="140" Margin="0,0,10,10">
-                                    <TextBlock Margin="0,0,5,0" Text="{setting:Localize AddModPackWindow.Text5}" />
+                    <ScrollViewer Name="ScrollViewer2" HorizontalScrollBarVisibility="Disabled">
+                        <DockPanel Name="ModPackFiles" Margin="20,10,20,10">
+                            <Grid
+                                Margin="0,0,0,10"
+                                ColumnDefinitions="auto,*,auto,auto"
+                                DockPanel.Dock="Top">
+                                <TextBlock
+                                    Grid.Column="0"
+                                    Margin="0,0,5,0"
+                                    Text="{setting:Localize Text.GameVersion}" />
+                                <ComboBox
+                                    Grid.Column="1"
+                                    Height="30"
+                                    Margin="0,0,10,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    ItemsSource="{Binding GameVersionList}"
+                                    SelectedItem="{Binding GameVersionDownload}" />
+                                <StackPanel
+                                    Grid.Column="2"
+                                    Margin="0,0,10,0"
+                                    Orientation="Horizontal">
+                                    <Button
+                                        Width="35"
+                                        Height="35"
+                                        Margin="-5"
+                                        Classes="top"
+                                        Command="{Binding LastVersionPage}"
+                                        Content="-"
+                                        IsEnabled="{Binding HaveLastVersionPage}" />
                                     <NumericUpDown
+                                        Width="60"
                                         Height="30"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Center"
+                                        Margin="5,0,5,0"
                                         FormatString="N0"
-                                        Maximum="{Binding MaxPageDownload}"
-                                        Minimum="0"
-                                        Value="{Binding PageDownload}" />
-                                </DockPanel>
-                                <StackPanel
-                                    Margin="0,1,10,10"
-                                    HorizontalAlignment="Right"
-                                    Orientation="Horizontal">
+                                        Maximum="{Binding MaxPageVersion}"
+                                        Minimum="1"
+                                        ShowButtonSpinner="False"
+                                        Value="{Binding PageVersion}" />
+                                    <Button
+                                        Width="35"
+                                        Height="35"
+                                        Margin="-5"
+                                        Classes="top"
+                                        Command="{Binding NextVersionPage}"
+                                        Content="+"
+                                        IsEnabled="{Binding HaveNextVersionPage}" />
+                                    <TextBlock Margin="5,0,0,0" Text="/" />
+                                    <TextBlock Text="{Binding MaxPageVersion}" />
+                                    <TextBlock Text="{setting:Localize AddModPackWindow.Text42}" />
+                                </StackPanel>
+                                <StackPanel Grid.Column="3" Orientation="Horizontal">
                                     <Button
                                         Width="100"
                                         Height="35"
@@ -166,7 +191,7 @@
                                         Content="{setting:Localize AddModPackWindow.Text12}"
                                         ToolTip.Tip="{setting:Localize ToolTip.Text91}" />
                                 </StackPanel>
-                            </WrapPanel>
+                            </Grid>
                             <Panel>
                                 <StackPanel IsVisible="{Binding !EmptyVersionDisplay, FallbackValue=true}">
                                     <ItemsControl
@@ -186,10 +211,10 @@
                                         Classes="top"
                                         Command="{Binding NextVersionPage}"
                                         Content="{setting:Localize AddModPackWindow.Text14}"
-                                        IsVisible="{Binding EnableNextPageDownload}" />
+                                        IsVisible="{Binding HaveNextVersionPage}" />
                                 </StackPanel>
                                 <Border
-                                    Margin="10,5,10,10"
+                                    Margin="0,10,0,10"
                                     Classes="t1"
                                     IsVisible="{Binding EmptyVersionDisplay}">
                                     <TextBlock
@@ -198,12 +223,15 @@
                                         Text="{setting:Localize AddModPackWindow.Text13}" />
                                 </Border>
                             </Panel>
-                        </StackPanel>
+                        </DockPanel>
                     </ScrollViewer>
                 </TabItem>
                 <TabItem Header="{setting:Localize AddModPackWindow.Text37}">
                     <Panel DataContext="{Binding Last}">
-                        <ScrollViewer IsVisible="{Binding HaveScreenshots}">
+                        <ScrollViewer
+                            Name="ScrollViewer3"
+                            HorizontalScrollBarVisibility="Disabled"
+                            IsVisible="{Binding HaveScreenshots}">
                             <ItemsControl HorizontalAlignment="Center" ItemsSource="{Binding Screenshots}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml.cs
@@ -1,3 +1,5 @@
+using System;
+using System.ComponentModel;
 using Avalonia.Controls;
 using Avalonia.Input;
 using ColorMC.Gui.UI.Model.Add;
@@ -11,6 +13,25 @@ public AddFileInfoControl()
         InitializeComponent();
 
         ModPackFiles.PointerPressed += ModPackFiles_PointerPressed;
+        DataContextChanged += AddFileInfoControl_DataContextChanged;
+    }
+
+    private void AddFileInfoControl_DataContextChanged(object? sender, EventArgs e)
+    {
+        if (DataContext is AddBaseModel model)
+        {
+            model.PropertyChanged += Model_PropertyChanged;
+        }
+    }
+
+    private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(AddBaseModel.DisplayItemInfo))
+        {
+            ScrollViewer1.ScrollToHome();
+            ScrollViewer2.ScrollToHome();
+            ScrollViewer3.ScrollToHome();
+        }
     }
 
     private void ModPackFiles_PointerPressed(object? sender, PointerPressedEventArgs e)
diff --git a/src/ColorMC.Gui/UI/Controls/Dialog/ProgressControl.axaml b/src/ColorMC.Gui/UI/Controls/Dialog/ProgressControl.axaml
@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:model="clr-namespace:ColorMC.Gui.UI.Model.Dialog"
     xmlns:setting="clr-namespace:ColorMC.Gui.UI"
-    Margin="10"
     x:DataType="model:ProgressModel"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/src/ColorMC.Gui/UI/Controls/Items/FileVersionItemControl.axaml b/src/ColorMC.Gui/UI/Controls/Items/FileVersionItemControl.axaml
@@ -6,10 +6,12 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:model="clr-namespace:ColorMC.Gui.UI.Model.Items"
     xmlns:setting="clr-namespace:ColorMC.Gui.UI"
+    d:DesignHeight="250"
+    d:DesignWidth="500"
     x:DataType="model:FileVersionItemModel"
     mc:Ignorable="d">
     <Border
-        Margin="10,5,10,5"
+        Margin="5,5,5,5"
         Background="{setting:Theme ItemBG}"
         BoxShadow="{Binding Border}"
         CornerRadius="5">
diff --git a/src/ColorMC.Gui/UI/Model/Add/AddFileInfoControlModel.cs b/src/ColorMC.Gui/UI/Model/Add/AddFileInfoControlModel.cs
@@ -30,12 +30,12 @@ public partial class AddBaseModel : IAddFileControl
     /// 文件列表当前页数
     /// </summary>
     [ObservableProperty]
-    private int? _pageDownload = 0;
+    private int? _pageVersion = 1;
     /// <summary>
     /// 文件列表最大页数
     /// </summary>
     [ObservableProperty]
-    private int _maxPageDownload;
+    private int _maxPageVersion;
     /// <summary>
     /// 文件列表游戏版本
     /// </summary>
@@ -48,11 +48,6 @@ public partial class AddBaseModel : IAddFileControl
     [ObservableProperty]
     private bool _emptyVersionDisplay;
     /// <summary>
-    /// 是否允许文件列表下一页
-    /// </summary>
-    [ObservableProperty]
-    private bool _enableNextPageDownload;
-    /// <summary>
     /// 是否显示项目详情
     /// </summary>
     [ObservableProperty]
@@ -69,6 +64,17 @@ public partial class AddBaseModel : IAddFileControl
     [ObservableProperty]
     private int _selectIndex = 0;
 
+    /// <summary>
+    /// 项目列表是否有下一页
+    /// </summary>
+    [ObservableProperty]
+    private bool _haveNextVersionPage;
+    /// <summary>
+    /// 是否有上一页
+    /// </summary>
+    [ObservableProperty]
+    private bool _haveLastVersionPage;
+
     partial void OnSelectIndexChanged(int value)
     {
         if (_load)
@@ -86,7 +92,7 @@ partial void OnSelectIndexChanged(int value)
     /// 页数改变
     /// </summary>
     /// <param name="value"></param>
-    partial void OnPageDownloadChanged(int? value)
+    partial void OnPageVersionChanged(int? value)
     {
         if (_load)
         {
@@ -110,6 +116,34 @@ partial void OnGameVersionDownloadChanged(string? value)
         LoadVersion(Last.SourceType, Last.ID);
     }
 
+    /// <summary>
+    /// 返回上一页
+    /// </summary>
+    [RelayCommand]
+    public void LastVersionPage()
+    {
+        if (_load || PageVersion <= 1)
+        {
+            return;
+        }
+
+        PageVersion -= 1;
+    }
+
+    /// <summary>
+    /// 下一页
+    /// </summary>
+    [RelayCommand]
+    public void NextVersionPage()
+    {
+        if (_load)
+        {
+            return;
+        }
+
+        PageVersion += 1;
+    }
+
     /// <summary>
     /// 搜索文件列表
     /// </summary>
@@ -141,6 +175,8 @@ public async Task Download()
     public void CloseView()
     {
         DisplayItemInfo = false;
+        FileList.Clear();
+        SelectIndex = 0;
     }
 
     /// <summary>
@@ -152,18 +188,19 @@ public async void LoadVersion(SourceType type, string pid)
         FileList.Clear();
         var dialog = Window.ShowProgress(LanguageUtils.Get("AddModPackWindow.Text19"));
         List<FileVersionItemModel>? list = null;
-        var page = 0;
-        PageDownload ??= 0;
+        var page = 1;
+        PageVersion ??= 1;
 
         if (type == SourceType.CurseForge)
         {
-            page = PageDownload ?? 0;
+            page = PageVersion ?? 1;
         }
 
+        page--;
         var res = await WebBinding.GetFileListAsync(type,
                pid, page,
                 GameVersionDownload, Loaders.Normal);
-        MaxPageDownload = res.Count / 50;
+        MaxPageVersion = res.Count / 50;
         list = res.List;
         var title = res.Name;
 
@@ -173,7 +210,7 @@ public async void LoadVersion(SourceType type, string pid)
             page = 0;
         }
 
-        EnableNextPageDownload = (MaxPageDownload - PageDownload) > 0;
+        VersionPageLoad();
 
         if (list == null)
         {
@@ -221,29 +258,9 @@ public void SetSelect(FileVersionItemModel item)
         item.IsSelect = true;
     }
 
-    /// <summary>
-    /// 返回上一页
-    /// </summary>
-    public void LastVersionPage()
-    {
-        if (_load || PageDownload <= 0)
-        {
-            return;
-        }
-
-        PageDownload -= 1;
-    }
-
-    /// <summary>
-    /// 下一页
-    /// </summary>
-    public void NextVersionPage()
+    protected void VersionPageLoad()
     {
-        if (_load)
-        {
-            return;
-        }
-
-        PageDownload += 1;
+        HaveNextVersionPage = PageVersion < MaxPageVersion;
+        HaveLastVersionPage = PageVersion > 1;
     }
 }
diff --git a/src/ColorMC.Gui/UI/Windows/MainView.axaml b/src/ColorMC.Gui/UI/Windows/MainView.axaml
@@ -32,7 +32,6 @@
             DisableOpeningAnimation="True"
             Identifier="{Binding WindowId}"
             IsMultipleDialogsEnabled="True"
-			DialogMargin="0"
             OverlayBackground="Transparent">
             <dialog:DialogHost.DataTemplates>
                 <utils:TemplateSelector />
