Skip to content

Commit fad4f5b

Browse files
committed
fix clicking twice to expand issue
event was wired to the same expand method cause calling it twice
1 parent bad007c commit fad4f5b

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl x:Class="Flow.Launcher.Plugin.Explorer.Views.ExplorerSettings"
1+
<UserControl x:Class="Flow.Launcher.Plugin.Explorer.Views.ExplorerSettings"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -36,12 +36,12 @@
3636
<ScrollViewer Margin="20 35 0 0" HorizontalScrollBarVisibility="Hidden" Grid.Row="0" VerticalScrollBarVisibility="Auto">
3737
<StackPanel>
3838
<Expander Name="expActionKeywords" Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
39-
Expanded="expActionKeywords_Click" Collapsed="expActionKeywords_Click">
39+
Expanded="expActionKeywords_Click" Collapsed="expActionKeywords_Collapsed">
4040
<ListView x:Name="lbxActionKeywords"
4141
ItemTemplate="{StaticResource ListViewActionKeywords}"/>
4242
</Expander>
4343
<Expander Name="expFolderLinks" Header="{DynamicResource plugin_explorer_quickfolderaccess_header}"
44-
Expanded="expFolderLinks_Click" Collapsed="expFolderLinks_Click"
44+
Expanded="expFolderLinks_Click" Collapsed="expFolderLinks_Collapsed"
4545
Margin="0 10 0 0">
4646
<ListView
4747
x:Name="lbxFolderLinks" AllowDrop="True"
@@ -50,7 +50,7 @@
5050
ItemTemplate="{StaticResource ListViewTemplateFolderLinks}"/>
5151
</Expander>
5252
<Expander x:Name="expExcludedPaths" Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
53-
Expanded="expExcludedPaths_Click" Collapsed="expExcludedPaths_Click"
53+
Expanded="expExcludedPaths_Click"
5454
Margin="0 10 0 0">
5555
<ListView
5656
x:Name="lbxExcludedPaths" AllowDrop="True"

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ private void expActionKeywords_Click(object sender, RoutedEventArgs e)
9393

9494
}
9595

96+
private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
97+
{
98+
if (!expActionKeywords.IsExpanded)
99+
expActionKeywords.Height = Double.NaN;
100+
}
101+
96102
private void expFolderLinks_Click(object sender, RoutedEventArgs e)
97103
{
98104
if (expFolderLinks.IsExpanded)
@@ -107,6 +113,12 @@ private void expFolderLinks_Click(object sender, RoutedEventArgs e)
107113
RefreshView();
108114
}
109115

116+
private void expFolderLinks_Collapsed(object sender, RoutedEventArgs e)
117+
{
118+
if (!expFolderLinks.IsExpanded)
119+
expFolderLinks.Height = Double.NaN;
120+
}
121+
110122
private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
111123
{
112124
if (expExcludedPaths.IsExpanded)

0 commit comments

Comments
 (0)