@ -3346,6 +3346,9 @@ namespace Xceed.Wpf.DataGrid
private void OnCollectionViewGroupsPropertyChanged ( ) private void OnCollectionViewGroupsPropertyChanged ( )
{ {
if ( m_groupsCollection = = m_collectionView . Groups )
return ;
this . HandleGlobalItemsReset ( ) ; this . HandleGlobalItemsReset ( ) ;
} }
@ -3387,11 +3390,11 @@ namespace Xceed.Wpf.DataGrid
break ; break ;
case NotifyCollectionChangedAction . Reset : case NotifyCollectionChangedAction . Reset :
// If there are group descriptions, the PropertyChanged on Groups will handle it.
if ( ( m_groupsCollection = = null ) | | ( m_collectionView . GroupDescriptions . Count = = 0 ) )
if ( m_collectionView . GroupDescriptions . Count = = 0 )
{ {
this . HandleGlobalItemsReset ( ) ; this . HandleGlobalItemsReset ( ) ;
} }
break ; break ;
} }
} }
@ -4213,22 +4216,22 @@ namespace Xceed.Wpf.DataGrid
private void RefreshGroupsCollection ( ) private void RefreshGroupsCollection ( )
{ {
if ( ( m_groupsCollection ! = null ) | | ( m_groupsCollection ! = m_collectionView . Groups ) ) var groupsCollection = m_collectionView . Groups ;
{ if ( m_groupsCollection = = groupsCollection )
return ;
if ( m_groupsCollection ! = null ) if ( m_groupsCollection ! = null )
{ {
CollectionChangedEventManager . RemoveListener ( m_groupsCollection , this ) ; CollectionChangedEventManager . RemoveListener ( m_groupsCollection , this ) ;
} }
m_groupsCollection = m_collectionView . Groups ; m_groupsCollection = groupsCollection ;
if ( m_groupsCollection ! = null ) if ( m_groupsCollection ! = null )
{ {
//Registers to the groups collection change notification.
CollectionChangedEventManager . AddListener ( m_groupsCollection , this ) ; CollectionChangedEventManager . AddListener ( m_groupsCollection , this ) ;
} }
} }
}
private GeneratorNode CreateStandaloneItemsNode ( ) private GeneratorNode CreateStandaloneItemsNode ( )
{ {
@ -4542,9 +4545,6 @@ namespace Xceed.Wpf.DataGrid
? parentNode . CollectionViewGroup . GetItems ( ) . Cast < CollectionViewGroup > ( ) . ToList ( ) ? parentNode . CollectionViewGroup . GetItems ( ) . Cast < CollectionViewGroup > ( ) . ToList ( )
: m_groupsCollection . Cast < CollectionViewGroup > ( ) . ToList ( ) ; : m_groupsCollection . Cast < CollectionViewGroup > ( ) . ToList ( ) ;
Debug . Assert ( ( oldGroups . Count > 0 ) , "The group being reset should have had at least a child group." ) ;
Debug . Assert ( ( newGroups . Count > 0 ) , "The group being reset should have at least a child group." ) ;
// If nothing has changed, avoid the heavy process of finding out which groups have been added,
// If nothing has changed, avoid the heavy process of finding out which groups have been added,
// removed and moved.
// removed and moved.
if ( newGroups . Count = = oldGroups . Count ) if ( newGroups . Count = = oldGroups . Count )
@ -5450,6 +5450,7 @@ namespace Xceed.Wpf.DataGrid
//then clear the items nodes
//then clear the items nodes
this . ClearItems ( ) ; this . ClearItems ( ) ;
this . RefreshGroupsCollection ( ) ;
//increment the generation count... to ensure that further calls to the index based functions are not messed up.
//increment the generation count... to ensure that further calls to the index based functions are not messed up.
this . IncrementCurrentGenerationCount ( ) ; this . IncrementCurrentGenerationCount ( ) ;
@ -6627,7 +6628,7 @@ namespace Xceed.Wpf.DataGrid
{ {
if ( managerType = = typeof ( CollectionChangedEventManager ) ) if ( managerType = = typeof ( CollectionChangedEventManager ) )
{ {
NotifyCollectionChangedEventArgs nccArgs = ( NotifyCollectionChangedEventArgs ) e ; var nccArgs = ( NotifyCollectionChangedEventArgs ) e ;
if ( sender = = m_collectionView ) if ( sender = = m_collectionView )
{ {
@ -6647,17 +6648,20 @@ namespace Xceed.Wpf.DataGrid
} }
else if ( managerType = = typeof ( PropertyChangedEventManager ) ) else if ( managerType = = typeof ( PropertyChangedEventManager ) )
{ {
var pcArgs = ( PropertyChangedEventArgs ) e ;
if ( sender = = m_collectionView ) if ( sender = = m_collectionView )
{ {
this . OnCollectionViewGroupsPropertyChanged ( ) ; this . OnCollectionViewGroupsPropertyChanged ( ) ;
return true ; return true ;
} }
else
{
//this is only registered on the DataGridContext, this has the effect of forwarding property changes for all properties of the DataGridContext
//this is only registered on the DataGridContext, this has the effect of forwarding property changes for all properties of the DataGridContext
PropertyChangedEventArgs pcArgs = ( PropertyChangedEventArgs ) e ;
this . OnNotifyPropertyChanged ( pcArgs ) ; this . OnNotifyPropertyChanged ( pcArgs ) ;
return true ; return true ;
} }
}
else if ( ( managerType = = typeof ( ViewChangedEventManager ) ) | | ( managerType = = typeof ( ThemeChangedEventManager ) ) ) else if ( ( managerType = = typeof ( ViewChangedEventManager ) ) | | ( managerType = = typeof ( ThemeChangedEventManager ) ) )
{ {
this . OnViewThemeChanged ( sender , e ) ; this . OnViewThemeChanged ( sender , e ) ;
BoucherS_cp
11 years ago