diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 443c9daf..7cfb594a 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -10,7 +10,7 @@ true Assets\Images\logo.ico BetterGI - 0.42.4 + 0.42.5 x64 embedded diff --git a/BetterGenshinImpact/Core/Script/Project/ScriptProject.cs b/BetterGenshinImpact/Core/Script/Project/ScriptProject.cs index 067523e2..9486cac2 100644 --- a/BetterGenshinImpact/Core/Script/Project/ScriptProject.cs +++ b/BetterGenshinImpact/Core/Script/Project/ScriptProject.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics; using System.IO; using System.Threading.Tasks; +using System.Windows; using System.Windows.Controls; using BetterGenshinImpact.Core.Script.Dependence; @@ -37,14 +38,17 @@ public class ScriptProject Manifest.Validate(ProjectPath); } - public StackPanel? LoadSettingUi(dynamic context) + public ScrollViewer? LoadSettingUi(dynamic context) { var settingItems = Manifest.LoadSettingItems(ProjectPath); if (settingItems.Count == 0) { return null; } - var stackPanel = new StackPanel(); + var stackPanel = new StackPanel + { + Margin = new Thickness(0, 0, 20, 0) // 给右侧滚动条留出位置 + }; foreach (var item in settingItems) { var controls = item.ToControl(context); @@ -54,7 +58,14 @@ public class ScriptProject } } - return stackPanel; + var scrollViewer = new ScrollViewer + { + Content = stackPanel, + VerticalScrollBarVisibility = ScrollBarVisibility.Auto, + MaxHeight = 350 // 设置最大高度 + }; + + return scrollViewer; } public IScriptEngine BuildScriptEngine(PathingPartyConfig? partyConfig = null)