CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-07-09 08:16:41 +12:00
Code Issues Projects Releases Wiki Activity

Reintroduce hover state of list items

Browse source 
Items were immediately selected when mouse hovered over
This commit is contained in:
Peter Kirmeier 2023-09-17 19:11:08 +02:00
parent 569722a5b0
commit b00092e4a5
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Business/WaitToLoadMenu.cs
View file

@ -32,7 +32,6 @@ namespace SystemTrayMenu.Business
{ {
if (MouseActive) if (MouseActive)
{ {
MouseSelect?.Invoke(itemData);
timerStartLoad.Stop(); timerStartLoad.Stop();
StopLoadMenu?.Invoke(); StopLoadMenu?.Invoke();
SetData(itemData); SetData(itemData);
@ -72,6 +71,7 @@ namespace SystemTrayMenu.Business
StopLoadMenu?.Invoke(); StopLoadMenu?.Invoke();
SetData(itemData); SetData(itemData);
MouseActive = true; MouseActive = true;
MouseSelect?.Invoke(itemData);
OpenSubMenu(); OpenSubMenu();
} }
@ -88,6 +88,11 @@ namespace SystemTrayMenu.Business
{ {
timerStartLoad.Stop(); timerStartLoad.Stop();
StopLoadMenu?.Invoke(); StopLoadMenu?.Invoke();
if (MouseActive && currentItemData != null)
{
MouseSelect?.Invoke(currentItemData);
}
OpenSubMenu(); OpenSubMenu();
} }

2
UserInterface/Menu.xaml
View file

@ -176,7 +176,7 @@
<ListView x:Name="dgv" x:FieldModifier="internal" Margin="6,1,6,1" Padding="0" d:ItemsSource="{d:SampleData ItemCount=50}" SelectionMode="Single" HorizontalContentAlignment="Stretch" <ListView x:Name="dgv" x:FieldModifier="internal" Margin="6,1,6,1" Padding="0" d:ItemsSource="{d:SampleData ItemCount=50}" SelectionMode="Single" HorizontalContentAlignment="Stretch"
Background="{x:Null}" BorderThickness="0" VirtualizingStackPanel.IsVirtualizing="False" Background="{x:Null}" BorderThickness="0" VirtualizingStackPanel.IsVirtualizing="False"
SelectionChanged="ListView_SelectionChanged" MouseLeave="ListView_MouseLeave" SelectionChanged="ListView_SelectionChanged"
ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.ScrollChanged="HandleScrollChanged"> ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.ScrollChanged="HandleScrollChanged">
<!--ListView."Childs".Border.Padding="0" // In ctor, see: dgv_border --> <!--ListView."Childs".Border.Padding="0" // In ctor, see: dgv_border -->
<ListView.Resources> <ListView.Resources>

19
UserInterface/Menu.xaml.cs
View file

@ -1117,25 +1117,6 @@ namespace SystemTrayMenu.UserInterface
} }
} }
private void ListView_MouseLeave(object sender, MouseEventArgs e)
{
// In case a sub menu is already open and another item was already selected
// but WaitToLoadMenu hasn't take action yet
// then we want to reset that selection, so the sub menu selection remains active only
if (SubMenu != null)
{
ListView lv = (ListView)sender;
foreach (RowData itemData in lv.Items)
{
if (itemData.SubMenu == SubMenu)
{
lv.SelectedItem = itemData;
break;
}
}
}
}
private void ListView_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) private void ListView_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
{ {
int count = dgv.Items.Count; int count = dgv.Items.Count;