prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 8b6c694434 into 24f6c90f72

Browse source
This commit is contained in:
VictoriousRaptor 2026-03-10 14:06:39 +08:00 committed by GitHub
commit f8366e59f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Flow.Launcher/Converters/OpenResultHotkeyVisibilityConverter.cs
View file

@ -17,7 +17,17 @@ public class OpenResultHotkeyVisibilityConverter : IValueConverter
if (value is ListBoxItem listBoxItem
&& ItemsControl.ItemsControlFromItemContainer(listBoxItem) is ListBox listBox)
number = listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
{
var dataItem = listBoxItem.DataContext;
if (dataItem != null)
{
var index = listBox.Items.IndexOf(dataItem);
if (index >= 0)
{
number = index + 1;
}
}
}
return number <= MaxVisibleHotkeys ? Visibility.Visible : Visibility.Collapsed;
}

17
Flow.Launcher/Converters/OrdinalConverter.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Globalization;
using System.Windows.Controls;
using System.Windows.Data;
@ -15,9 +15,20 @@ public class OrdinalConverter : IValueConverter
return 0;
}
var res = listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
return res == 10 ? 0 : res; // 10th item => HOTKEY+0
var dataItem = listBoxItem.DataContext;
if (dataItem == null)
{
return 0;
}
var index = listBox.Items.IndexOf(dataItem);
if (index < 0)
{
return 0;
}
var res = index + 1;
return res == 10 ? 0 : res; // 10th item => HOTKEY+0
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new InvalidOperationException();

4
Flow.Launcher/ResultListBox.xaml
View file

@ -27,7 +27,7 @@
Style="{DynamicResource BaseListboxStyle}"
VirtualizingPanel.ScrollUnit="Item"
VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.VirtualizationMode="Standard"
VirtualizingStackPanel.VirtualizationMode="Recycling"
Visibility="{Binding Visibility}"
mc:Ignorable="d">
<!-- IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083 -->
@ -82,7 +82,7 @@
<TextBlock.Text>
<MultiBinding StringFormat="{}{0}+{1}">
<Binding Mode="OneWay" Path="Settings.OpenResultModifiers" />
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>

15
Flow.Launcher/ResultListBox.xaml.cs
View file

@ -12,7 +12,7 @@ namespace Flow.Launcher
{
protected Lock _lock = new();
private Point _lastpos;
private ListBoxItem curItem = null;
private ResultViewModel _currentResult = null;
public ResultListBox()
{
InitializeComponent();
@ -60,9 +60,12 @@ namespace Flow.Launcher
{
lock (_lock)
{
curItem = (ListBoxItem)sender;
var p = e.GetPosition((IInputElement)sender);
_lastpos = p;
if (sender is FrameworkElement { DataContext: ResultViewModel result })
{
_currentResult = result;
var p = e.GetPosition((IInputElement)sender);
_lastpos = p;
}
}
}
@ -82,9 +85,9 @@ namespace Flow.Launcher
{
lock (_lock)
{
if (curItem != null)
if (_currentResult != null && sender is ListBox listBox)
{
curItem.IsSelected = true;
listBox.SelectedItem = _currentResult;
}
}
}