up

Coloryr · Jun 3, 2024 · 56acc44 · 56acc44
1 parent 61effe6
commit 56acc44
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/src/ColorMC.Core/Helpers/JavaHelper.cs b/src/ColorMC.Core/Helpers/JavaHelper.cs
@@ -169,6 +169,8 @@ private static List<string> GetOracleJavaInstallPath(string javaKeyPath)
                     path.Add(home);
                 }
             }
+
+            return path;
         }
         catch
         {
@@ -196,6 +198,8 @@ private static List<string> GetAdoptiumJavaInstallPath(string javaKeyPath)
                     path.Add(home);
                 }
             }
+
+            return path;
         }
         catch
         {
@@ -223,6 +227,8 @@ private static List<string> GetZuluJavaInstallPath(string javaKeyPath)
                     path.Add(home);
                 }
             }
+
+            return path;
         }
         catch
         {

diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml.cs
@@ -52,12 +52,16 @@ public AddControl(GameSettingObj obj) : this()
 
     private void ScrollViewer1_ScrollChanged(object? sender, ScrollChangedEventArgs e)
     {
-        if (e.ExtentDelta == e.OffsetDelta)
+        if (e.ExtentDelta == e.OffsetDelta || e.ExtentDelta.Y < 0)
         {
             return;
         }
         if (DataContext is AddControlModel model)
         {
+            if (model.EmptyDisplay)
+            {
+                return;
+            }
             model.DisplayFilter = false;
         }
     }

diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddGameControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddGameControl.axaml.cs
@@ -169,7 +169,7 @@ public void SetGroup(string? group)
     {
         if (DataContext is AddGameModel model)
         {
-            model.Group = group;
+            model.Group ??= group;
         }
     }
 }
diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml
@@ -100,15 +100,6 @@
             </Border>
 
             <Panel Margin="0,5,0,0">
-                <Border
-                    Margin="0,0,0,5"
-                    Classes="t1"
-                    IsVisible="{Binding EmptyDisplay}">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        FontSize="30"
-                        Text="{setting:Localize AddModPackWindow.Text13}" />
-                </Border>
                 <ScrollViewer Name="ScrollViewer1" VerticalScrollBarVisibility="Visible">
                     <ItemsControl
                         HorizontalAlignment="Stretch"
@@ -121,6 +112,15 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                 </ScrollViewer>
+                <Border
+                    Margin="0,0,0,5"
+                    Classes="t1"
+                    IsVisible="{Binding EmptyDisplay}">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="30"
+                        Text="{setting:Localize AddModPackWindow.Text13}" />
+                </Border>
             </Panel>
         </DockPanel>
 

diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs b/src/ColorMC.Gui/UI/Controls/Add/AddModPackControl.axaml.cs
@@ -35,12 +35,16 @@ public AddModPackControl()
 
     private void ScrollViewer1_ScrollChanged(object? sender, ScrollChangedEventArgs e)
     {
-        if (e.ExtentDelta == e.OffsetDelta)
+        if (e.ExtentDelta == e.OffsetDelta || e.ExtentDelta.Y < 0)
         {
             return;
         }
         if (DataContext is AddModPackControlModel model)
         {
+            if (model.EmptyDisplay)
+            {
+                return;
+            }
             model.DisplayFilter = false;
         }
     }

diff --git a/src/ColorMC.Gui/UI/Controls/Download/DownloadControl.axaml b/src/ColorMC.Gui/UI/Controls/Download/DownloadControl.axaml
@@ -13,7 +13,10 @@
     Background="{setting:Colors TranBack}"
     mc:Ignorable="d">
     <DockPanel Margin="5">
-        <Border Classes="t1" DockPanel.Dock="Top">
+        <Border
+            Margin="5"
+            Classes="t1"
+            DockPanel.Dock="Top">
             <WrapPanel>
                 <ProgressBar
                     Height="20"

diff --git a/src/ColorMC.Gui/UI/Controls/Setting/SettingControl.cs b/src/ColorMC.Gui/UI/Controls/Setting/SettingControl.cs
@@ -30,7 +30,7 @@ public SettingControl()
         UseName = ToString() ?? "SettingControl";
     }
 
-    public SettingControl(int mainversion) : base()
+    public SettingControl(int mainversion) : this()
     {
         _needJava = mainversion;
     }

diff --git a/src/TODO b/src/TODO
@@ -1,5 +1,7 @@
 ⚫2024.6.3
 改进部分UI okl
+修复JAVA扫描问题 okl
+修复设置界面问题 okl
 
 ⚫2024.5.25
 修复窗口图标显示问题 okl