Skip to content

Commit d7ab4f0

Browse files
committed
fix incorrect button visibility in Explorer's expander control
fix the issue where button visibility is still visible when expander is collapsed
1 parent 749e7ff commit d7ab4f0

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<Expander
9090
x:Name="expExcludedPaths"
9191
Margin="0,10,0,0"
92+
Collapsed="expExcludedPaths_Collapsed"
9293
Expanded="expExcludedPaths_Click"
9394
Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}">
9495
<ListView

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ public void RefreshView()
6060

6161
lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
6262

63-
btnDelete.Visibility = Visibility.Hidden;
64-
btnEdit.Visibility = Visibility.Hidden;
65-
btnAdd.Visibility = Visibility.Hidden;
63+
SetButtonVisibilityToHidden();
6664

6765
if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
6866
{
@@ -123,8 +121,8 @@ private void expActionKeywords_Click(object sender, RoutedEventArgs e)
123121

124122
private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
125123
{
126-
if (!expActionKeywords.IsExpanded)
127-
expActionKeywords.Height = double.NaN;
124+
expActionKeywords.Height = double.NaN;
125+
SetButtonVisibilityToHidden();
128126
}
129127

130128
private void expAccessLinks_Click(object sender, RoutedEventArgs e)
@@ -143,8 +141,8 @@ private void expAccessLinks_Click(object sender, RoutedEventArgs e)
143141

144142
private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e)
145143
{
146-
if (!expAccessLinks.IsExpanded)
147-
expAccessLinks.Height = double.NaN;
144+
expAccessLinks.Height = double.NaN;
145+
SetButtonVisibilityToHidden();
148146
}
149147

150148
private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
@@ -161,6 +159,11 @@ private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
161159
RefreshView();
162160
}
163161

162+
private void expExcludedPaths_Collapsed(object sender, RoutedEventArgs e)
163+
{
164+
SetButtonVisibilityToHidden();
165+
}
166+
164167
private void btnDelete_Click(object sender, RoutedEventArgs e)
165168
{
166169
var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
@@ -309,6 +312,13 @@ private void btnOpenIndexingOptions_Click(object sender, RoutedEventArgs e)
309312
{
310313
viewModel.OpenWindowsIndexingOptions();
311314
}
315+
316+
public void SetButtonVisibilityToHidden()
317+
{
318+
btnDelete.Visibility = Visibility.Hidden;
319+
btnEdit.Visibility = Visibility.Hidden;
320+
btnAdd.Visibility = Visibility.Hidden;
321+
}
312322
}
313323

314324
public class ActionKeywordView

0 commit comments

Comments
 (0)