mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Use loaded event to ensure accessability
This commit is contained in:
parent
c2eca7dc39
commit
05cd01d1d6
2 changed files with 32 additions and 22 deletions
|
|
@ -110,6 +110,7 @@
|
||||||
Expanded="Expander_Expanded"
|
Expanded="Expander_Expanded"
|
||||||
Header="{DynamicResource plugin_explorer_generalsetting_header}"
|
Header="{DynamicResource plugin_explorer_generalsetting_header}"
|
||||||
IsExpanded="False"
|
IsExpanded="False"
|
||||||
|
Loaded="GeneralSettingsExpander_Loaded"
|
||||||
Style="{StaticResource CustomExpanderStyle}">
|
Style="{StaticResource CustomExpanderStyle}">
|
||||||
|
|
||||||
<Grid Margin="20 5 0 5">
|
<Grid Margin="20 5 0 5">
|
||||||
|
|
@ -664,6 +665,7 @@
|
||||||
Drop="LbxAccessLinks_OnDrop"
|
Drop="LbxAccessLinks_OnDrop"
|
||||||
ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
|
ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
|
||||||
ItemsSource="{Binding Settings.QuickAccessLinks}"
|
ItemsSource="{Binding Settings.QuickAccessLinks}"
|
||||||
|
Loaded="lbxAccessLinks_Loaded"
|
||||||
SelectedItem="{Binding SelectedQuickAccessLink}" />
|
SelectedItem="{Binding SelectedQuickAccessLink}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
@ -698,9 +700,11 @@
|
||||||
<!-- Index Search Excluded Paths Expander -->
|
<!-- Index Search Excluded Paths Expander -->
|
||||||
<Expander
|
<Expander
|
||||||
x:Name="ExcludedPathsExpander"
|
x:Name="ExcludedPathsExpander"
|
||||||
|
Margin="0"
|
||||||
|
BorderThickness="0 0 0 0"
|
||||||
Expanded="Expander_Expanded"
|
Expanded="Expander_Expanded"
|
||||||
Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
|
Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
|
||||||
IsExpanded="False" BorderThickness="0 0 0 0" Margin="0"
|
IsExpanded="False"
|
||||||
Style="{StaticResource CustomExpanderStyle}">
|
Style="{StaticResource CustomExpanderStyle}">
|
||||||
<Grid Margin="20 5 0 5">
|
<Grid Margin="20 5 0 5">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
|
@ -728,6 +732,7 @@
|
||||||
Drop="LbxExcludedPaths_OnDrop"
|
Drop="LbxExcludedPaths_OnDrop"
|
||||||
ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
|
ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
|
||||||
ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
|
ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
|
||||||
|
Loaded="lbxExcludedPaths_Loaded"
|
||||||
SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
|
SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
|
||||||
public partial class ExplorerSettings
|
public partial class ExplorerSettings
|
||||||
{
|
{
|
||||||
private readonly SettingsViewModel _viewModel;
|
private readonly SettingsViewModel _viewModel;
|
||||||
private readonly List<Expander> _expanders;
|
private readonly List<Expander> _expanders = new();
|
||||||
|
|
||||||
public ExplorerSettings(SettingsViewModel viewModel)
|
public ExplorerSettings(SettingsViewModel viewModel)
|
||||||
{
|
{
|
||||||
|
|
@ -27,26 +27,6 @@ namespace Flow.Launcher.Plugin.Explorer.Views
|
||||||
DataContext = viewModel;
|
DataContext = viewModel;
|
||||||
|
|
||||||
ActionKeywordModel.Init(viewModel.Settings);
|
ActionKeywordModel.Init(viewModel.Settings);
|
||||||
|
|
||||||
// Ensure lbxAccessLinks and lbxExcludedPaths are initialized before accessing Items
|
|
||||||
// This might require Loaded event if they are not immediately available
|
|
||||||
// For now, assuming they are available after InitializeComponent()
|
|
||||||
if (lbxAccessLinks != null)
|
|
||||||
lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
|
|
||||||
|
|
||||||
if (lbxExcludedPaths != null)
|
|
||||||
lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
|
|
||||||
|
|
||||||
_expanders = new List<Expander>
|
|
||||||
{
|
|
||||||
GeneralSettingsExpander,
|
|
||||||
ContextMenuExpander,
|
|
||||||
PreviewPanelExpander,
|
|
||||||
EverythingExpander,
|
|
||||||
ActionKeywordsExpander,
|
|
||||||
QuickAccessExpander,
|
|
||||||
ExcludedPathsExpander
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AccessLinkDragDrop(string containerName, DragEventArgs e)
|
private void AccessLinkDragDrop(string containerName, DragEventArgs e)
|
||||||
|
|
@ -124,5 +104,30 @@ namespace Flow.Launcher.Plugin.Explorer.Views
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void lbxAccessLinks_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void lbxExcludedPaths_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void GeneralSettingsExpander_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var expanders = new List<Expander>
|
||||||
|
{
|
||||||
|
GeneralSettingsExpander,
|
||||||
|
ContextMenuExpander,
|
||||||
|
PreviewPanelExpander,
|
||||||
|
EverythingExpander,
|
||||||
|
ActionKeywordsExpander,
|
||||||
|
QuickAccessExpander,
|
||||||
|
ExcludedPathsExpander
|
||||||
|
};
|
||||||
|
_expanders.AddRange(expanders);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue