From f4fdf362e7ea4e99405edc6d117df67a006aff6e Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 22 Apr 2023 23:13:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=8A=E5=A4=A9=E5=B0=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8A=A0=E5=85=A5=E6=BB=91=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Views/UI/TaskQueueView.xaml | 31 +- .../UserControl/FightSettingsUserControl.xaml | 555 +++++++++--------- 2 files changed, 293 insertions(+), 293 deletions(-) diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml index 4f42fda4c9..fbe458dd34 100644 --- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml +++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml @@ -3,20 +3,20 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding" + xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:dd="urn:gong-wpf-dragdrop" xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:helper="clr-namespace:MaaWpfGui.Helper" xmlns:local="clr-namespace:MaaWpfGui" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:s="https://github.com/canton7/Stylet" - xmlns:vm="clr-namespace:MaaWpfGui" - xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels" - xmlns:userControl="clr-namespace:MaaWpfGui.Views.UserControl" - xmlns:helper="clr-namespace:MaaWpfGui.Helper" - xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI" - xmlns:styles="clr-namespace:MaaWpfGui.Styles" - xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls" xmlns:properties="clr-namespace:MaaWpfGui.Styles.Properties" + xmlns:s="https://github.com/canton7/Stylet" + xmlns:styles="clr-namespace:MaaWpfGui.Styles" + xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI" + xmlns:userControl="clr-namespace:MaaWpfGui.Views.UserControl" + xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels" + xmlns:vm="clr-namespace:MaaWpfGui" MinWidth="720" d:DataContext="{d:DesignInstance {x:Type ui:TaskQueueViewModel}}" d:DesignHeight="495" @@ -170,19 +170,22 @@ - + - + VerticalAlignment="Bottom"> + + @@ -190,11 +193,11 @@ + HorizontalScrollBarVisibility="Disabled" + IsInertiaEnabled="True"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +