From 529246436d82afdb8d97e9ed4b1b3034f110026e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 27 Nov 2021 14:04:39 +0900
Subject: [PATCH] Merge Dev

---
 Flow.Launcher/SettingWindow.xaml | 148 +++++++++++--------------------
 1 file changed, 54 insertions(+), 94 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9b133b6da..d173f30d7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1862,101 +1862,61 @@
                                         </StackPanel>
                                     </Border>
 
-                            <StackPanel>
-
-                                <Border
-                                    Margin="0,30,0,0"
-                                    Padding="0"
-                                    CornerRadius="5"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <StackPanel Orientation="Vertical">
-                                        <Border
-                                            Margin="0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
-                                                </StackPanel>
-                                                <ui:ToggleSwitch
-                                                    Grid.Row="0"
-                                                    Grid.Column="2"
-                                                    Width="100"
-                                                    Margin="0,0,2,0"
-                                                    IsOn="{Binding UseAnimation, Mode=TwoWay}" />
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    Margin="24,0,16,0"
-                                                    VerticalAlignment="Center"
-                                                    FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20">
-                                                    &#xedb5;
-                                                </TextBlock>
-                                            </ItemsControl>
-                                        </Border>
-                                        <Separator
-                                            Width="Auto"
-                                            BorderBrush="#e5e5e5"
-                                            BorderThickness="1" />
-                                        <Border
-                                            Margin="0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
-                                                </StackPanel>
-                                                <ui:ToggleSwitch
-                                                    Grid.Row="0"
-                                                    Grid.Column="2"
-                                                    Width="100"
-                                                    Margin="0,0,2,0"
-                                                    IsOn="{Binding UseSound, Mode=TwoWay}" />
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    Margin="24,0,16,0"
-                                                    VerticalAlignment="Center"
-                                                    FontFamily="/Resources/#Segoe Fluent Icons"
-                                                    FontSize="20">
-                                                    &#xe994;
-                                                </TextBlock>
-                                            </ItemsControl>
-                                        </Border>
-                                    </StackPanel>
-                                </Border>
-
-                                <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
-                                        </StackPanel>
-                                        <Button
-                                            Grid.Column="2"
-                                            Width="180"
-                                            Margin="0,0,18,0"
-                                            HorizontalAlignment="Center"
-                                            Click="OpenPluginFolder"
-                                            Content="{DynamicResource OpenThemeFolder}"
-                                            DockPanel.Dock="Top" />
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="24,0,16,0"
-                                            VerticalAlignment="Center"
-                                            FontFamily="/Resources/#Segoe Fluent Icons"
-                                            FontSize="20">
-                                            &#xe838;
-                                        </TextBlock>
-                                    </ItemsControl>
-                                </Border>
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </Border>
-        </TabItem>
                                     <StackPanel>
+
+                                        <Border
+                                            Margin="0,30,0,0"
+                                            Padding="0"
+                                            CornerRadius="5"
+                                            Style="{DynamicResource SettingGroupBox}">
+                                            <StackPanel Orientation="Vertical">
+                                                <Border
+                                                    Margin="0"
+                                                    BorderThickness="0"
+                                                    Style="{DynamicResource SettingGroupBox}">
+                                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                                        <StackPanel Style="{StaticResource TextPanel}">
+                                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Animation}" />
+                                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource AnimationTip}" />
+                                                        </StackPanel>
+                                                        <ui:ToggleSwitch
+                                                            Grid.Row="0"
+                                                            Grid.Column="2"
+                                                            Width="100"
+                                                            Margin="0,0,2,0"
+                                                            IsOn="{Binding UseAnimation, Mode=TwoWay}" />
+                                                        <TextBlock Style="{StaticResource Glyph}">
+                                                            &#xedb5;
+                                                        </TextBlock>
+                                                    </ItemsControl>
+                                                </Border>
+                                                <Separator
+                                                    Width="Auto"
+                                                    BorderThickness="1"
+                                                    Style="{StaticResource SettingSeparatorStyle}" />
+                                                <Border
+                                                    Margin="0"
+                                                    BorderThickness="0"
+                                                    Style="{DynamicResource SettingGroupBox}">
+                                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                                        <StackPanel Style="{StaticResource TextPanel}">
+                                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SoundEffect}" />
+                                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource SoundEffectTip}" />
+                                                        </StackPanel>
+                                                        <ui:ToggleSwitch
+                                                            Grid.Row="0"
+                                                            Grid.Column="2"
+                                                            Width="100"
+                                                            Margin="0,0,2,0"
+                                                            IsOn="{Binding UseSound, Mode=TwoWay}" />
+                                                        <TextBlock Style="{StaticResource Glyph}">
+                                                            &#xe994;
+                                                        </TextBlock>
+                                                    </ItemsControl>
+                                                </Border>
+                                            </StackPanel>
+                                        </Border>
+
                                         <Border Margin="0,12,0,12" Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
                                                 <StackPanel Style="{StaticResource TextPanel}">