Skip to content

Commit 1ed1e41

Browse files
XceedBoucherSXceedBoucherS
committed
V4.1.0 Released
1 parent 61789cf commit 1ed1e41

File tree

461 files changed

+952
-622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+952
-622
lines changed

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
3131

3232
[assembly: AssemblyCompany( "Xceed Software Inc." )]
3333
[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
34-
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
34+
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
3535

3636

3737

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
3838
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
3939
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
40+
<avalonDockConverters:AnchorableContextMenuAutoHideHeaderConverter x:Key="AnchorableContextMenuAutoHideHeaderConverter" />
4041

4142
<DataTemplate x:Key="DocumentPaneControlContentTemplate">
4243
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
@@ -524,6 +525,9 @@
524525
<RotateTransform Angle="90" />
525526
</Setter.Value>
526527
</Setter>
528+
<Setter Property="ToolTip"
529+
TargetName="PART_AutoHidePin"
530+
Value="{x:Static avalonDockProperties:Resources.Window_Restore}" />
527531
</DataTrigger>
528532
<DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
529533
Value="True">
@@ -979,7 +983,7 @@
979983
Command="{Binding Path=DockCommand}" />
980984
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
981985
Command="{Binding Path=DockAsDocumentCommand}" />
982-
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
986+
<MenuItem Header="{Binding LayoutElement.IsAutoHidden, Converter={StaticResource AnchorableContextMenuAutoHideHeaderConverter}}"
983987
Command="{Binding Path=AutoHideCommand}" />
984988
<MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
985989
Command="{Binding Path=CloseCommand}"

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
3131

3232
[assembly: AssemblyCompany( "Xceed Software Inc." )]
3333
[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
34-
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
34+
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
3535

3636

3737

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
3636
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
3737
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
38+
<avalonDockConverters:AnchorableContextMenuAutoHideHeaderConverter x:Key="AnchorableContextMenuAutoHideHeaderConverter" />
3839

3940
<DataTemplate x:Key="DocumentPaneControlContentTemplate">
4041
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
@@ -533,6 +534,9 @@
533534
<RotateTransform Angle="90" />
534535
</Setter.Value>
535536
</Setter>
537+
<Setter Property="ToolTip"
538+
TargetName="PART_AutoHidePin"
539+
Value="{x:Static avalonDockProperties:Resources.Window_Restore}" />
536540
</DataTrigger>
537541
<DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
538542
Value="True">
@@ -1002,7 +1006,7 @@
10021006
Command="{Binding Path=DockCommand}" />
10031007
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
10041008
Command="{Binding Path=DockAsDocumentCommand}" />
1005-
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
1009+
<MenuItem Header="{Binding LayoutElement.IsAutoHidden, Converter={StaticResource AnchorableContextMenuAutoHideHeaderConverter}}"
10061010
Command="{Binding Path=AutoHideCommand}" />
10071011
<MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
10081012
Command="{Binding Path=CloseCommand}"

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
3131

3232
[assembly: AssemblyCompany( "Xceed Software Inc." )]
3333
[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
34-
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
34+
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
3535

3636

3737
// Setting ComVisible to false makes the types in this assembly not visible

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter" />
3838
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
3939
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
40+
<avalonDockConverters:AnchorableContextMenuAutoHideHeaderConverter x:Key="AnchorableContextMenuAutoHideHeaderConverter" />
4041

4142
<DataTemplate x:Key="DocumentPaneControlContentTemplate">
4243
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
@@ -620,6 +621,9 @@
620621
<RotateTransform Angle="90" />
621622
</Setter.Value>
622623
</Setter>
624+
<Setter Property="ToolTip"
625+
TargetName="PART_AutoHidePin"
626+
Value="{x:Static avalonDockProperties:Resources.Window_Restore}" />
623627
</DataTrigger>
624628
<DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}"
625629
Value="True">
@@ -1099,7 +1103,7 @@
10991103
Command="{Binding Path=DockCommand}" />
11001104
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}"
11011105
Command="{Binding Path=DockAsDocumentCommand}" />
1102-
<MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}"
1106+
<MenuItem Header="{Binding LayoutElement.IsAutoHidden, Converter={StaticResource AnchorableContextMenuAutoHideHeaderConverter}}"
11031107
Command="{Binding Path=AutoHideCommand}" />
11041108
<MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}"
11051109
Command="{Binding Path=CloseCommand}"

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,20 @@ internal void Abort()
192192
#region Private Methods
193193

194194
private void GetOverlayWindowHosts()
195-
{
196-
_overlayWindowHosts.AddRange( _manager.GetFloatingWindowsByZOrder().OfType<LayoutAnchorableFloatingWindowControl>().Where( fw => fw != _floatingWindow && fw.IsVisible ) );
197-
_overlayWindowHosts.Add( _manager );
195+
{
196+
var windows = _manager.GetWindowsByZOrder().Where( w => (w != _floatingWindow) && w.IsVisible );
197+
198+
foreach( var w in windows )
199+
{
200+
if( w == Window.GetWindow( _manager ) )
201+
{
202+
_overlayWindowHosts.Add( _manager );
203+
}
204+
else if( w is LayoutAnchorableFloatingWindowControl )
205+
{
206+
_overlayWindowHosts.Add( w as LayoutAnchorableFloatingWindowControl );
207+
}
208+
}
198209
}
199210

200211
#endregion

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ public void Drop( LayoutFloatingWindow floatingWindow )
116116
{
117117
Dispatcher.BeginInvoke( new Action( () =>
118118
{
119-
if( ( currentActiveContent.Root != null ) && ( currentActiveContent.Root.Manager != null ) )
120-
{
121-
currentActiveContent.Root.Manager.MoveFocus( new TraversalRequest( FocusNavigationDirection.Next ) );
122-
}
123119
currentActiveContent.IsSelected = false;
124120
currentActiveContent.IsActive = false;
125121
currentActiveContent.IsActive = true;

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ protected override void OnSelectionChanged( SelectionChangedEventArgs e )
9797

9898

9999

100+
101+
100102

101103

102104

‎ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,11 @@ internal void BringFocusOnDockingManager()
524524
}
525525
}
526526

527+
internal bool IsClosing()
528+
{
529+
return _isClosing;
530+
}
531+
527532
#endregion
528533

529534
#region Private Methods

0 commit comments

Comments
 (0)