javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Intercepting containers for threads.

Browse Source
This commit is contained in:
Burak Kaan Köse
2025-10-26 23:35:09 +01:00
parent 79d5b6ed40
commit d9fc365aeb
12 changed files with 528 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Mail.WinUI/Controls/ListView/WinoListView.cs
+76 -10
View File
@@ -1,4 +1,5 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Wino.Mail.ViewModels.Data;
namespace Wino.Mail.WinUI.Controls.ListView;
@@ -7,34 +8,70 @@ public partial class WinoListView : Microsoft.UI.Xaml.Controls.ListView
{
public bool IsAllSelected => Items.Count == SelectedItems.Count;
protected override DependencyObject GetContainerForItemOverride() => new WinoListViewItem();
public WinoListView()
{
ChoosingItemContainer += WinoListView_ChoosingItemContainer;
}
private void WinoListView_ChoosingItemContainer(ListViewBase sender, ChoosingItemContainerEventArgs args)
{
if (args.Item is ThreadMailItemViewModel)
{
args.ItemContainer = new WinoThreadMailItemViewModelListViewItem();
}
else if (args.Item is MailItemViewModel)
{
args.ItemContainer = new WinoMailItemViewModelListViewItem();
}
// Handle the preparation in PrepareContainerForItemOverride
args.IsContainerPrepared = false;
}
protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
{
if (item is MailItemViewModel mailItemViewModel && element is WinoMailItemViewModelListViewItem container)
{
// Ensure the container's selection state matches the model's state
// This is crucial for virtualization scenarios where containers are recycled
container.IsSelected = mailItemViewModel.IsSelected;
}
else if (item is ThreadMailItemViewModel threadMailItemViewModel && element is WinoThreadMailItemViewModelListViewItem threadContainer)
{
threadContainer.IsThreadExpanded = threadMailItemViewModel.IsThreadExpanded;
}
base.PrepareContainerForItemOverride(element, item);
}
public bool SelectMailItemContainer(MailItemViewModel mailItemViewModel)
{
WinoListViewItem? itemContainer = null;
WinoMailItemViewModelListViewItem? itemContainer = null;
WinoThreadMailItemViewModelListViewItem? threadContainer = null;
foreach (var item in Items)
{
if (item is MailItemViewModel mailItem && mailItem.Id == mailItemViewModel.Id)
{
itemContainer = ContainerFromItem(mailItemViewModel) as WinoListViewItem;
itemContainer = ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
break;
}
else if (item is ThreadMailItemViewModel threadMailItemViewModel && threadMailItemViewModel.HasUniqueId(mailItemViewModel.MailCopy.UniqueId))
{
itemContainer = ContainerFromItem(threadMailItemViewModel) as WinoListViewItem;
threadContainer = ContainerFromItem(threadMailItemViewModel) as WinoThreadMailItemViewModelListViewItem;
// Try to get the inner WinoListView.
if (itemContainer != null)
if (threadContainer != null)
{
itemContainer.IsExpanded = true;
threadContainer.IsThreadExpanded = true;
var innerListViewControl = itemContainer.GetWinoListViewControl();
var innerListViewControl = threadContainer.GetWinoListViewControl();
if (innerListViewControl != null)
{
itemContainer = innerListViewControl.ContainerFromItem(mailItemViewModel) as WinoListViewItem;
itemContainer = innerListViewControl.ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
}
}
@@ -42,8 +79,37 @@ public partial class WinoListView : Microsoft.UI.Xaml.Controls.ListView
}
}
itemContainer?.IsSelected = true;
if (itemContainer != null)
{
itemContainer.IsSelected = true;
return true;
}
else if (threadContainer != null)
{
return true;
}
return itemContainer != null;
return false;
}
public void ChangeSelectionMode(ListViewSelectionMode mode)
{
// Not only this control, but also all inner WinoListView controls should change the selection mode.
// TODO: New threads added after this call won't have the correct selection mode.
SelectionMode = mode;
foreach (var item in Items)
{
if (item is ThreadMailItemViewModel)
{
var itemContainer = ContainerFromItem(item) as WinoThreadMailItemViewModelListViewItem;
if (itemContainer != null)
{
var innerListViewControl = itemContainer.GetWinoListViewControl();
innerListViewControl?.ChangeSelectionMode(mode);
}
}
}
}
}
Wino.Mail.WinUI/Controls/ListView/WinoListViewStyles.xaml
+15 -16
View File
@@ -2,14 +2,16 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Wino.Controls"
xmlns:local="using:Wino.Mail.WinUI.Controls.ListView">
<ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<ResourceDictionary Source="/Styles/WinoExpanderStyle.xaml" />
<ResourceDictionary>
<!-- Thread Mail ListViewItem Style -->
<Style x:Key="DefaultThreadListViewItemStyle" TargetType="local:WinoListViewItem">
<Style x:Key="DefaultThreadListViewItemStyle" TargetType="local:WinoMailItemViewModelListViewItem">
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
<Setter Property="Background" Value="{ThemeResource ListViewItemBackground}" />
@@ -30,20 +32,17 @@
<Setter Property="FocusVisualSecondaryThickness" Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:WinoListViewItem">
<Expander Header="Thread" IsExpanded="{TemplateBinding IsExpanded}">
<Expander.Content>
<!-- Expandable Content -->
<ContentPresenter
x:Name="ThreadContent"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}" />
</Expander.Content>
</Expander>
<ControlTemplate TargetType="local:WinoMailItemViewModelListViewItem">
<!-- Expandable Content -->
<ContentPresenter
x:Name="ThreadContent"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}" />
</ControlTemplate>
</Setter.Value>
</Setter>
@@ -53,7 +52,7 @@
<Style
x:Key="DefaultMailListViewItemStyle"
BasedOn="{StaticResource DefaultListViewItemStyle}"
TargetType="local:WinoListViewItem" />
TargetType="local:WinoMailItemViewModelListViewItem" />
<local:WinoMailItemContainerStyleSelector
x:Name="WinoMailItemContainerStyleSelector"
Wino.Mail.WinUI/Controls/ListView/WinoListViewItem.cs → Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
+7 -33
View File
@@ -1,47 +1,30 @@
using CommunityToolkit.Mvvm.Messaging;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Wino.Mail.ViewModels.Data;
using Wino.Messaging.Client.Mails;
namespace Wino.Mail.WinUI.Controls.ListView;
public partial class WinoListViewItem : ListViewItem
public partial class WinoMailItemViewModelListViewItem : ListViewItem
{
public bool IsExpanded
public WinoMailItemViewModelListViewItem()
{
get { return (bool)GetValue(IsExpandedProperty); }
set { SetValue(IsExpandedProperty, value); }
}
public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register(nameof(IsExpanded), typeof(bool), typeof(WinoListViewItem), new PropertyMetadata(false, OnIsExpandedChanged));
public WinoListViewItem()
{
DefaultStyleKey = typeof(WinoListViewItem);
DefaultStyleKey = typeof(WinoMailItemViewModelListViewItem);
RegisterPropertyChangedCallback(IsSelectedProperty, OnIsSelectedChanged);
}
private static void OnIsExpandedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is WinoListViewItem item)
{
// Handle expansion state change if needed
}
}
protected override void OnContentChanged(object oldContent, object newContent)
{
base.OnContentChanged(oldContent, newContent);
if (oldContent is IMailListItem oldMailItem)
if (oldContent is MailItemViewModel oldMailItem)
{
UnregisterSelectionCallback(oldMailItem);
}
if (newContent is IMailListItem newMailItem)
if (newContent is MailItemViewModel newMailItem)
{
IsSelected = newMailItem.IsSelected;
RegisterSelectionCallback(newMailItem);
@@ -61,9 +44,9 @@ public partial class WinoListViewItem : ListViewItem
// From model
private void MailPropChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (sender is not IMailListItem mailItem) return;
if (sender is not MailItemViewModel mailItem) return;
if (e.PropertyName == nameof(IMailListItem.IsSelected)) ApplySelectionForContainer(mailItem);
if (e.PropertyName == nameof(MailItemViewModel.IsSelected)) ApplySelectionForContainer(mailItem);
}
// From container.
@@ -91,13 +74,4 @@ public partial class WinoListViewItem : ListViewItem
IsSelected = mailItem.IsSelected;
}
}
public WinoListView? GetWinoListViewControl()
{
var expander = GetTemplateChild("ExpanderPart") as Expander;
if (expander?.Content is ContentPresenter presenter) return VisualTreeHelper.GetChild(presenter, 0) as WinoListView;
return null;
}
}
Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
+116
View File
@@ -0,0 +1,116 @@
using System.ComponentModel;
using System.Linq;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Wino.Controls;
using Wino.Helpers;
using Wino.Mail.ViewModels.Data;
namespace Wino.Mail.WinUI.Controls.ListView;
public partial class WinoThreadMailItemViewModelListViewItem : ListViewItem
{
public bool IsThreadExpanded
{
get { return (bool)GetValue(IsThreadExpandedProperty); }
set { SetValue(IsThreadExpandedProperty, value); }
}
public static readonly DependencyProperty IsThreadExpandedProperty = DependencyProperty.Register(nameof(IsThreadExpanded), typeof(bool), typeof(WinoThreadMailItemViewModelListViewItem), new PropertyMetadata(false, new PropertyChangedCallback(OnIsThreadExpandedChanged)));
public WinoThreadMailItemViewModelListViewItem()
{
RegisterPropertyChangedCallback(IsSelectedProperty, OnIsSelectedChanged);
}
private static void OnIsThreadExpandedChanged(DependencyObject sender, DependencyPropertyChangedEventArgs dp)
{
// 1. Reflect expansion changes to WinoExpander.
// 2. Automatically select first item on expansion, if none selected.
// 3. Unselect all items on collapse.
var control = sender as WinoThreadMailItemViewModelListViewItem;
var innerControl = control?.GetWinoListViewControl();
var expander = control?.GetExpander();
if (innerControl == null || control == null || expander == null) return;
// 1
expander.IsExpanded = control.IsThreadExpanded;
// 2
if (control.IsThreadExpanded && innerControl.SelectedItems.Count == 0 && innerControl.Items.Count > 0)
{
innerControl.SelectedItem = innerControl.Items[0];
}
// 3
if (!control.IsSelected) innerControl?.SelectedItems.Clear();
}
protected override void OnContentChanged(object oldContent, object newContent)
{
base.OnContentChanged(oldContent, newContent);
if (oldContent is ThreadMailItemViewModel oldMailItem)
{
UnregisterSelectionCallback(oldMailItem);
}
if (newContent is ThreadMailItemViewModel newMailItem)
{
IsSelected = newMailItem.IsSelected;
RegisterSelectionCallback(newMailItem);
}
}
private void OnIsSelectedChanged(DependencyObject sender, DependencyProperty dp)
{
IsThreadExpanded = IsSelected;
}
private void UnregisterSelectionCallback(ThreadMailItemViewModel mailItem)
{
mailItem.PropertyChanged -= MailPropChanged;
}
private void MailPropChanged(object? sender, PropertyChangedEventArgs e)
{
if (sender is not ThreadMailItemViewModel mailItem) return;
if (e.PropertyName == nameof(ThreadMailItemViewModel.IsThreadExpanded))
{
ApplySelectionForContainer(mailItem);
}
}
private void RegisterSelectionCallback(ThreadMailItemViewModel mailItem)
{
mailItem.PropertyChanged += MailPropChanged;
}
private void ApplySelectionForModel(ThreadMailItemViewModel mailItem)
{
if (mailItem.IsThreadExpanded != IsThreadExpanded)
{
mailItem.IsThreadExpanded = IsThreadExpanded;
}
}
private void ApplySelectionForContainer(ThreadMailItemViewModel mailItem)
{
if (IsThreadExpanded != mailItem.IsThreadExpanded) IsThreadExpanded = mailItem.IsThreadExpanded;
}
public WinoListView? GetWinoListViewControl()
{
var expander = GetExpander();
if (expander?.Content is WinoListView control) return control;
return null;
}
public WinoExpander? GetExpander() => WinoVisualTreeHelper.FindDescendants<WinoExpander>(this).FirstOrDefault();
}
Wino.Mail.WinUI/Controls/WinoExpander.cs
+1 -1
View File
@@ -83,7 +83,7 @@ public partial class WinoExpander : Control
return;
}
IsExpanded = !IsExpanded;
// IsExpanded = !IsExpanded;
}
private static void OnIsExpandedChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)