style: FightSetting模块添加滚轮

src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml

@@ -12,171 +12,165 @@
     d:DataContext="{d:DesignInstance {x:Type vm:TaskQueueViewModel}}"
     d:DesignWidth="250"
     mc:Ignorable="d">
-    <Grid Width="220">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" MinWidth="100" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <StackPanel Orientation="Vertical">
-                <CheckBox
-                    Height="30"
-                    Margin="10,6"
-                    VerticalContentAlignment="Center"
-                    Content="{DynamicResource UseSanityPotion}"
-                    IsChecked="{Binding UseMedicine}" />
-                <CheckBox
-                    Height="30"
-                    Margin="10,6"
-                    VerticalContentAlignment="Center"
-                    Content="{DynamicResource UseOriginitePrime}"
-                    IsChecked="{Binding UseStone}"
-                    ToolTip="{DynamicResource CheckBoxesNotSaved}" />
-                <CheckBox
-                    Height="30"
-                    Margin="10,6"
-                    VerticalContentAlignment="Center"
-                    Content="{DynamicResource PerformBattles}"
-                    IsChecked="{Binding HasTimesLimited}"
-                    ToolTip="{DynamicResource CheckBoxesNotSaved}" />
-            </StackPanel>
-            <StackPanel Grid.Column="1" Orientation="Vertical">
-                <hc:TextBox
-                    Width="60"
-                    Height="30"
-                    Margin="0,6"
-                    HorizontalAlignment="Left"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    InputMethod.IsInputMethodEnabled="False"
-                    Text="{Binding MedicineNumber}"
-                    TextType="Int" />
-                <hc:TextBox
-                    Width="60"
-                    Height="30"
-                    Margin="0,6"
-                    HorizontalAlignment="Left"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    InputMethod.IsInputMethodEnabled="False"
-                    Text="{Binding StoneNumber}"
-                    TextType="Int" />
-                <hc:TextBox
-                    Width="60"
-                    Height="30"
-                    Margin="0,6"
-                    HorizontalAlignment="Left"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    InputMethod.IsInputMethodEnabled="False"
-                    Text="{Binding MaxTimes}"
-                    TextType="Int" />
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" MinWidth="100" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <StackPanel Orientation="Vertical">
-                <CheckBox
-                    Height="30"
-                    Margin="10,6"
-                    VerticalContentAlignment="Center"
-                    Content="{DynamicResource AssignedMaterial}"
-                    IsChecked="{Binding IsSpecifiedDrops}"
-                    ToolTip="{DynamicResource NoAutoNavigation}" />
-                <Grid Height="42" Visibility="{c:Binding IsSpecifiedDrops}">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
-                        Text="{DynamicResource Quantity}"
-                        TextAlignment="Center" />
-                </Grid>
-            </StackPanel>
-            <StackPanel Grid.Column="1" Orientation="Vertical">
-                <ComboBox
-                    Height="30"
-                    Margin="0,6"
-                    VerticalContentAlignment="Center"
-                    DisplayMemberPath="Display"
-                    IsDropDownOpen="{Binding IsDropDown}"
-                    IsEditable="True"
-                    IsTextSearchEnabled="True"
-                    ItemsSource="{Binding DropsList}"
-                    SelectedValue="{Binding DropsItemId}"
-                    SelectedValuePath="Value"
-                    Text="{Binding DropsItem}" />
-
-                <hc:TextBox
-                    Width="60"
-                    Height="30"
-                    Margin="0,6"
-                    HorizontalAlignment="Left"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    InputMethod.IsInputMethodEnabled="False"
-                    Text="{Binding DropsQuantity}"
-                    TextType="Int"
-                    Visibility="{c:Binding IsSpecifiedDrops}" />
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Row="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" MinWidth="100" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <StackPanel Grid.Row="2" Orientation="Vertical">
-                <Grid Height="42">
-                    <TextBlock
+    <ScrollViewer>
+        <Grid Width="220" Margin="0,0,5,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="100" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Vertical">
+                    <CheckBox
+                        Height="30"
                         Margin="10,6"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
-                        Text="{DynamicResource StageSelect}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap" />
-                </Grid>
-                <Grid Height="42">
-                    <TextBlock
+                        VerticalContentAlignment="Center"
+                        Content="{DynamicResource UseSanityPotion}"
+                        IsChecked="{Binding UseMedicine}" />
+                    <CheckBox
+                        Height="30"
                         Margin="10,6"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
-                        Text="{DynamicResource StageSelect2}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding AlternateStageDisplay}" />
-                </Grid>
-            </StackPanel>
-            <StackPanel
-                Grid.Row="2"
-                Grid.Column="1"
-                Orientation="Vertical">
-                <ComboBox
-                    Height="30"
-                    Margin="0,6"
-                    Padding="6,0,0,0"
-                    VerticalContentAlignment="Center"
-                    DisplayMemberPath="Display"
-                    IsHitTestVisible="{c:Binding !FightTaskRunning}"
-                    ItemsSource="{Binding StageList}"
-                    SelectedValue="{Binding Stage1}"
-                    SelectedValuePath="Value" />
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
+                        VerticalContentAlignment="Center"
+                        Content="{DynamicResource UseOriginitePrime}"
+                        IsChecked="{Binding UseStone}"
+                        ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+                    <CheckBox
+                        Height="30"
+                        Margin="10,6"
+                        VerticalContentAlignment="Center"
+                        Content="{DynamicResource PerformBattles}"
+                        IsChecked="{Binding HasTimesLimited}"
+                        ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+                </StackPanel>
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <hc:TextBox
+                        Width="60"
+                        Height="30"
+                        Margin="0,6"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        InputMethod.IsInputMethodEnabled="False"
+                        Text="{Binding MedicineNumber}"
+                        TextType="Int" />
+                    <hc:TextBox
+                        Width="60"
+                        Height="30"
+                        Margin="0,6"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        InputMethod.IsInputMethodEnabled="False"
+                        Text="{Binding StoneNumber}"
+                        TextType="Int" />
+                    <hc:TextBox
+                        Width="60"
+                        Height="30"
+                        Margin="0,6"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        InputMethod.IsInputMethodEnabled="False"
+                        Text="{Binding MaxTimes}"
+                        TextType="Int" />
+                </StackPanel>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="100" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Vertical">
+                    <CheckBox
+                        Height="30"
+                        Margin="10,6"
+                        VerticalContentAlignment="Center"
+                        Content="{DynamicResource AssignedMaterial}"
+                        IsChecked="{Binding IsSpecifiedDrops}"
+                        ToolTip="{DynamicResource NoAutoNavigation}" />
+                    <Grid Height="42" Visibility="{Binding IsSpecifiedDrops, Converter={StaticResource Boolean2VisibilityConverter}}">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource TextBlockDefault}"
+                            Text="{DynamicResource Quantity}"
+                            TextAlignment="Center" />
+                    </Grid>
+                </StackPanel>
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <ComboBox
+                        Height="30"
+                        Margin="0,6"
+                        VerticalContentAlignment="Center"
+                        DisplayMemberPath="Display"
+                        IsDropDownOpen="{Binding IsDropDown}"
+                        IsEditable="True"
+                        IsTextSearchEnabled="True"
+                        ItemsSource="{Binding DropsList}"
+                        SelectedValue="{Binding DropsItemId}"
+                        SelectedValuePath="Value"
+                        Text="{Binding DropsItem}" />
+
+                    <hc:TextBox
+                        Width="60"
+                        Height="30"
+                        Margin="0,6"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        InputMethod.IsInputMethodEnabled="False"
+                        Text="{Binding DropsQuantity}"
+                        TextType="Int"
+                        Visibility="{Binding IsSpecifiedDrops, Converter={StaticResource Boolean2VisibilityConverter}}" />
+                </StackPanel>
+            </Grid>
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="100" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Grid.Row="2" Orientation="Vertical">
+                    <Grid Height="42">
+                        <TextBlock
+                            Margin="10,6"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource TextBlockDefault}"
+                            Text="{DynamicResource StageSelect}"
+                            TextAlignment="Center"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                    <Grid Height="42" Visibility="{Binding AlternateStageDisplay, Converter={StaticResource Boolean2VisibilityConverter}}">
+                        <TextBlock
+                            Margin="10,6"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource TextBlockDefault}"
+                            Text="{DynamicResource StageSelect2}"
+                            TextAlignment="Center"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </StackPanel>
+                <StackPanel
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Orientation="Vertical">
+                    <ComboBox
+                        Height="30"
+                        Margin="0,6"
+                        Padding="6,0,0,0"
+                        VerticalContentAlignment="Center"
+                        DisplayMemberPath="Display"
+                        IsHitTestVisible="{c:Binding !FightTaskRunning}"
+                        ItemsSource="{Binding StageList}"
+                        SelectedValue="{Binding Stage1}"
+                        SelectedValuePath="Value" />
                     <ComboBox
-                        Grid.Column="0"
                         Height="30"
                         Margin="0,6"
                         Padding="6,0,0,0"
@@ -186,9 +180,8 @@
                         ItemsSource="{Binding StageList}"
                         SelectedValue="{Binding Stage2}"
                         SelectedValuePath="Value"
-                        Visibility="{Binding AlternateStageDisplay}" />
+                        Visibility="{Binding AlternateStageDisplay, Converter={StaticResource Boolean2VisibilityConverter}}" />
                     <ComboBox
-                        Grid.Column="1"
                         Height="30"
                         Margin="0,6"
                         Padding="6,0,0,0"
@@ -198,23 +191,23 @@
                         ItemsSource="{Binding StageList}"
                         SelectedValue="{Binding Stage3}"
                         SelectedValuePath="Value"
-                        Visibility="{Binding AlternateStageDisplay}" />
-                </Grid>
+                        Visibility="{Binding AlternateStageDisplay, Converter={StaticResource Boolean2VisibilityConverter}}" />
+                </StackPanel>
+            </Grid>
 
+            <StackPanel Grid.Row="3">
+                <Button
+                    Height="30"
+                    Margin="0,6"
+                    Padding="14,2"
+                    HorizontalAlignment="Right"
+                    HorizontalContentAlignment="Center"
+                    Command="{s:Action SetParams}"
+                    Content="{DynamicResource Amend}"
+                    FontSize="10"
+                    Visibility="{c:Binding !Idle}" />
             </StackPanel>
         </Grid>
 
-        <StackPanel Grid.Row="3">
-            <Button
-                Height="30"
-                Margin="0,6"
-                Padding="14,2"
-                HorizontalAlignment="Right"
-                HorizontalContentAlignment="Center"
-                Command="{s:Action SetParams}"
-                Content="{DynamicResource Amend}"
-                FontSize="10"
-                Visibility="{c:Binding !Idle}" />
-        </StackPanel>
-    </Grid>
+    </ScrollViewer>
 </UserControl>

src/MeoAsstGui/ViewModels/SettingsViewModel.cs

@@ -1893,7 +1893,7 @@ namespace MeoAsstGui
             {
                 SetAndNotify(ref _useAlternateStage, value);
                 var taskQueueViewModel = _container.Get<TaskQueueViewModel>();
-                taskQueueViewModel.AlternateStageDisplay = value ? "Visible" : "Hidden";
+                taskQueueViewModel.AlternateStageDisplay = value;
                 ViewStatusStorage.Set("GUI.UseAlternateStage", value.ToString());
                 if (value)
                 {

src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs

@@ -1556,12 +1556,12 @@ namespace MeoAsstGui
             }
         }
 
-        private string _alternateStageDisplay = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString)) ? "Visible" : "Hidden";
+        private bool _alternateStageDisplay = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString));
 
         /// <summary>
         /// Gets or sets a value indicating whether to use alternate stage.
         /// </summary>
-        public string AlternateStageDisplay
+        public bool AlternateStageDisplay
         {
             get
             {

src/MeoAsstGui/Views/TaskQueueView.xaml

@@ -10,10 +10,11 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:vm="clr-namespace:MeoAsstGui;assembly=MeoAsstGui"
+    MinWidth="720"
     d:DataContext="{d:DesignInstance {x:Type vm:TaskQueueViewModel}}"
     d:DesignHeight="495"
     d:DesignWidth="800"
-    mc:Ignorable="d" MinWidth="720">
+    mc:Ignorable="d">
     <Grid Margin="20">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -45,13 +46,14 @@
                         x:Name="TaskList"
                         Grid.Row="0"
                         Width="190"
+                        MinHeight="220"
                         Margin="0,10,0,0"
                         HorizontalAlignment="Center"
                         dd:DragDrop.IsDragSource="{Binding Idle}"
                         dd:DragDrop.IsDropTarget="{Binding Idle}"
                         BorderThickness="0"
                         ItemsSource="{Binding Path=TaskItemViewModels}"
-                        ToolTip="{DynamicResource LabelSequenceTip}" MinHeight="220">
+                        ToolTip="{DynamicResource LabelSequenceTip}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
@@ -65,8 +67,7 @@
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
-                    <Grid
-                        Grid.Row="1">
+                    <Grid Grid.Row="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="*" />
@@ -107,8 +108,9 @@
                 </Grid>
             </Border>
             <Grid
+                Grid.Row="1"
                 Margin="10"
-                Grid.Row="1" HorizontalAlignment="Center">
+                HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
@@ -116,38 +118,37 @@
                 <TextBlock
                     Margin="5"
                     Padding="5,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource Then}"
-                    TextWrapping="Wrap"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center" />
+                    TextWrapping="Wrap" />
                 <ComboBox
                     Grid.Column="1"
-                    Margin="5"
                     Width="120"
+                    Margin="5"
                     DisplayMemberPath="Display"
                     ItemsSource="{Binding ActionAfterCompletedList}"
                     SelectedValue="{Binding ActionAfterCompleted}"
-                    SelectedValuePath="Value"/>
+                    SelectedValuePath="Value" />
             </Grid>
-            <Grid
-                Grid.Row="2">
+            <Grid Grid.Row="2">
                 <Button
                     Height="50"
                     MinWidth="100"
                     MaxWidth="100"
                     Margin="5"
-                    Visibility="{Binding Idle, Converter={StaticResource Boolean2VisibilityConverter}}"
                     Command="{s:Action LinkStart}"
-                    Content="{DynamicResource LinkStart}" />
+                    Content="{DynamicResource LinkStart}"
+                    Visibility="{Binding Idle, Converter={StaticResource Boolean2VisibilityConverter}}" />
                 <Button
                     Height="50"
                     MinWidth="100"
                     MaxWidth="100"
                     Margin="5"
-                    Visibility="{c:Binding Path=!Idle}"
                     Command="{s:Action Stop}"
-                    Content="{DynamicResource Stop}" />
+                    Content="{DynamicResource Stop}"
+                    Visibility="{c:Binding Path=!Idle}" />
             </Grid>
 
             <!--<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment ="Center" >-->
@@ -161,18 +162,26 @@
             <!--</StackPanel>-->
 
         </Grid>
-        <local:FightSettingsUserControl
-            Grid.Column="1"
-            Margin="10"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top" />
-        <TextBlock
-            Grid.Column="1"
-            Margin="10"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Bottom"
-            Style="{StaticResource TextBlockDefault}"
-            Text="{Binding StagesOfToday}" />
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <!--周日的关卡特别多，高度待测，暂定为167，此时默认大小无滚轮-->
+                <RowDefinition Height="167"/>
+            </Grid.RowDefinitions>
+            <local:FightSettingsUserControl
+                Grid.Row="0"
+                Margin="10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top" />
+            <TextBlock
+                Grid.Row="1"
+                Margin="10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                Style="{StaticResource TextBlockDefault}"
+                Text="{Binding StagesOfToday}" />
+        </Grid>
+
         <!--<GridSplitter Grid.Column="2" Width="5" HorizontalAlignment="Stretch" />-->
         <!--<Rectangle Grid.Column="2" VerticalAlignment="Stretch" Fill="LightGray" Width="4" />-->
         <ScrollViewer