From 63c4bb6a234aef8e138accc1b5f1cd60df142e2a Mon Sep 17 00:00:00 2001
From: qhy040404 <qhy040404@163.com>
Date: Thu, 7 Mar 2024 13:00:52 +0800
Subject: [PATCH] fix command bar blink

---
 .../View/Control/BaseValueSlider.xaml         | 62 ++++++++++---------
 .../View/Control/DescParamComboBox.xaml       | 28 +++++----
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml
index aeb7ba4b..117c80f8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml
@@ -22,35 +22,37 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <cwc:SettingsExpander
-        Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
-        IsExpanded="True"
-        ItemTemplate="{StaticResource BaseValueTemplate}"
-        ItemsSource="{x:Bind BaseValueInfo.Values, Mode=OneWay}">
-        <StackPanel
-            Height="16"
-            Margin="8,0,0,0"
-            Orientation="Horizontal"
-            Spacing="16">
-            <TextBlock VerticalAlignment="Center" Text="{x:Bind BaseValueInfo.CurrentLevelFormatted, Mode=OneWay}"/>
-            <CheckBox
-                MinWidth="0"
-                Margin="0,-8,0,-8"
-                Padding="8,0,0,0"
-                VerticalAlignment="Center"
-                VerticalContentAlignment="Center"
-                Content="{shcm:ResourceString Name=ViewControlBaseValueSliderPromoted}"
-                IsChecked="{x:Bind BaseValueInfo.Promoted, Mode=TwoWay}"
-                Visibility="{x:Bind IsPromoteVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
-            <Slider
-                MinWidth="240"
-                Margin="0,-16,0,-16"
-                VerticalAlignment="Center"
-                Maximum="{x:Bind BaseValueInfo.MaxLevel, Mode=OneWay}"
-                Minimum="1"
-                StepFrequency="1"
-                Value="{x:Bind BaseValueInfo.CurrentLevel, Mode=TwoWay}"/>
-        </StackPanel>
-    </cwc:SettingsExpander>
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+        <cwc:SettingsExpander
+            Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
+            IsExpanded="True"
+            ItemTemplate="{StaticResource BaseValueTemplate}"
+            ItemsSource="{x:Bind BaseValueInfo.Values, Mode=OneWay}">
+            <StackPanel
+                Height="16"
+                Margin="8,0,0,0"
+                Orientation="Horizontal"
+                Spacing="16">
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind BaseValueInfo.CurrentLevelFormatted, Mode=OneWay}"/>
+                <CheckBox
+                    MinWidth="0"
+                    Margin="0,-8,0,-8"
+                    Padding="8,0,0,0"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Content="{shcm:ResourceString Name=ViewControlBaseValueSliderPromoted}"
+                    IsChecked="{x:Bind BaseValueInfo.Promoted, Mode=TwoWay}"
+                    Visibility="{x:Bind IsPromoteVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                <Slider
+                    MinWidth="240"
+                    Margin="0,-16,0,-16"
+                    VerticalAlignment="Center"
+                    Maximum="{x:Bind BaseValueInfo.MaxLevel, Mode=OneWay}"
+                    Minimum="1"
+                    StepFrequency="1"
+                    Value="{x:Bind BaseValueInfo.CurrentLevel, Mode=TwoWay}"/>
+            </StackPanel>
+        </cwc:SettingsExpander>
+    </ScrollViewer>
 
 </UserControl>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml
index dc6e6479..dc5f33c9 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml
@@ -26,17 +26,19 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <cwc:SettingsExpander
-        Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
-        IsExpanded="True"
-        ItemTemplate="{StaticResource ParameterDescriptionTemplate}"
-        ItemsSource="{x:Bind SelectedItem.Parameters, Mode=OneWay}">
-        <shc:SizeRestrictedContentControl Margin="0,-8">
-            <ComboBox
-                x:Name="LevelSelectorComboBox"
-                DisplayMemberPath="Level"
-                SelectionChanged="OnLevelSelectorComboBoxSelectionChanged"
-                Style="{StaticResource SettingsContentComboBoxStyle}"/>
-        </shc:SizeRestrictedContentControl>
-    </cwc:SettingsExpander>
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+        <cwc:SettingsExpander
+            Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
+            IsExpanded="True"
+            ItemTemplate="{StaticResource ParameterDescriptionTemplate}"
+            ItemsSource="{x:Bind SelectedItem.Parameters, Mode=OneWay}">
+            <shc:SizeRestrictedContentControl Margin="0,-8">
+                <ComboBox
+                    x:Name="LevelSelectorComboBox"
+                    DisplayMemberPath="Level"
+                    SelectionChanged="OnLevelSelectorComboBoxSelectionChanged"
+                    Style="{StaticResource SettingsContentComboBoxStyle}"/>
+            </shc:SizeRestrictedContentControl>
+        </cwc:SettingsExpander>
+    </ScrollViewer>
 </UserControl>