Skip to content

Commit

Permalink
V3.7.0 Released
Browse files Browse the repository at this point in the history
  • Loading branch information
@XceedBoucherS
XceedBoucherS committed Nov 26, 2019
1 parent 92ce0cf commit 1e0b826
Show file tree
Hide file tree
Showing 89 changed files with 814 additions and 6,049 deletions.
2 changes: 1 addition & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "3.6";
public const string BaseVersion = "3.7";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
".0.0";
Expand Down
14 changes: 7 additions & 7 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />

<DataTemplate x:Key="DocumentPaneControlContentTemplate">
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>

<!--DocumentPaneControlStyle-->
<Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle"
TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
Expand Down Expand Up @@ -276,13 +280,9 @@
</Setter.Value>
</Setter>

<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>
</Setter.Value>
</Setter>
<Setter Property="ContentTemplate"
Value="{StaticResource DocumentPaneControlContentTemplate}" />

</Style>

<!--AnchorablePaneControlStyle-->
Expand Down
62 changes: 0 additions & 62 deletions ...olution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "3.6";
public const string BaseVersion = "3.7";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
".0.0";
Expand Down
14 changes: 7 additions & 7 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />

<DataTemplate x:Key="DocumentPaneControlContentTemplate">
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>

<Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle"
TargetType="ToggleButton">
<Setter Property="Background"
Expand Down Expand Up @@ -284,13 +288,9 @@
</Setter.Value>
</Setter>

<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>
</Setter.Value>
</Setter>
<Setter Property="ContentTemplate"
Value="{StaticResource DocumentPaneControlContentTemplate}" />

</Style>

<!--AnchorablePaneControlStyle-->
Expand Down
2 changes: 1 addition & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "3.6";
public const string BaseVersion = "3.7";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
".0.0";
Expand Down
14 changes: 7 additions & 7 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
<avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter" />
<avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />

<DataTemplate x:Key="DocumentPaneControlContentTemplate">
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>


<Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle"
TargetType="ToggleButton">
Expand Down Expand Up @@ -365,13 +369,9 @@
</Setter.Value>
</Setter>

<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
<avalonDockControls:LayoutDocumentControl Model="{Binding}" />
</DataTemplate>
</Setter.Value>
</Setter>
<Setter Property="ContentTemplate"
Value="{StaticResource DocumentPaneControlContentTemplate}" />

</Style>

<!--AnchorablePaneControlStyle-->
Expand Down
2 changes: 1 addition & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
internal static class _XceedVersionInfo
{
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string BaseVersion = "3.6";
public const string BaseVersion = "3.7";
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
public const string Version = BaseVersion +
".0.0";
Expand Down
5 changes: 4 additions & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,15 @@ public void Drop( LayoutFloatingWindow floatingWindow )
this.Drop( fwAsDocument );
}

Dispatcher.BeginInvoke( new Action( () =>
if( currentActiveContent != null )
{
Dispatcher.BeginInvoke( new Action( () =>
{
currentActiveContent.IsSelected = false;
currentActiveContent.IsActive = false;
currentActiveContent.IsActive = true;
} ), DispatcherPriority.Background );
}
}

public virtual bool HitTest( Point dragPoint )
Expand Down
44 changes: 22 additions & 22 deletions ...dWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,28 @@ internal LayoutAnchorablePaneGroupControl( LayoutAnchorablePaneGroup model )

protected override void OnFixChildrenDockLengths()
{
//if( _model.Orientation == Orientation.Horizontal )
//{
// for( int i = 0; i < _model.Children.Count; i++ )
// {
// var childModel = _model.Children[ i ] as ILayoutPositionableElement;
// if( !childModel.DockWidth.IsStar )
// {
// childModel.DockWidth = new GridLength( 1.0, GridUnitType.Star );
// }
// }
//}
//else
//{
// for( int i = 0; i < _model.Children.Count; i++ )
// {
// var childModel = _model.Children[ i ] as ILayoutPositionableElement;
// if( !childModel.DockHeight.IsStar )
// {
// childModel.DockHeight = new GridLength( 1.0, GridUnitType.Star );
// }
// }
//}
if( _model.Orientation == Orientation.Horizontal )
{
for( int i = 0; i < _model.Children.Count; i++ )
{
var childModel = _model.Children[ i ] as ILayoutPositionableElement;
if( !childModel.DockWidth.IsStar )
{
childModel.DockWidth = new GridLength( 1.0, GridUnitType.Star );
}
}
}
else
{
for( int i = 0; i < _model.Children.Count; i++ )
{
var childModel = _model.Children[ i ] as ILayoutPositionableElement;
if( !childModel.DockHeight.IsStar )
{
childModel.DockHeight = new GridLength( 1.0, GridUnitType.Star );
}
}
}
}

#endregion
Expand Down
30 changes: 30 additions & 0 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows.Controls;
using System.Windows.Input;
using Xceed.Wpf.AvalonDock.Layout;
using System.Collections;
using System;

namespace Xceed.Wpf.AvalonDock.Controls
{
Expand Down Expand Up @@ -166,6 +168,34 @@ protected override void OnMouseRightButtonDown( MouseButtonEventArgs e )
}


#endregion

#region Internal Methods

internal void SetResourcesFromObject( FrameworkElement current )
{
while( current != null )
{
if( current.Resources.Count > 0 )
{
var entries = new DictionaryEntry[ current.Resources.Count ];
current.Resources.CopyTo( entries, 0 );
entries.ForEach( x =>
{
try
{
if( this.Resources[ x.Key ] == null )
{
this.Resources.Add( x.Key, x.Value );
}
}
catch( Exception ) { }
} );
}
current = current.Parent as FrameworkElement;
}
}

#endregion

#region Private Methods
Expand Down
54 changes: 54 additions & 0 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,34 @@ internal LayoutDocumentPaneControl( LayoutDocumentPane model )

#region Properties



























#region Model

public ILayoutElement Model
{
get
Expand All @@ -65,6 +93,8 @@ public ILayoutElement Model

#endregion

#endregion

#region Overrides

protected override System.Collections.IEnumerator LogicalChildren
Expand Down Expand Up @@ -113,5 +143,29 @@ private void OnLayoutUpdated( object sender, EventArgs e )
}

#endregion
























}
}
Loading

0 comments on commit 1e0b826

Please sign in to comment.