Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes several issues (#1379 and #1381) in xceedsoftware/wpftoolkit #1393

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes several issues (#1379 and #1381) in xceedsoftware/wpftoolkit #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c3716
Fixes issue #1379 in xceedsoftware/wpftoolkit
nonsensesoftware Oct 9, 2018
1b0114d
Fixes NullReferenceException in #1354
nonsensesoftware Oct 15, 2018
38d36f2
Prevent crash from setting negative size
nonsensesoftware Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ protected override void OnMouseEnter( MouseEventArgs e )
{
base.OnMouseEnter( e );

if( _draggingItem != this &&
if( _draggingItem != null &&
_draggingItem != this &&
e.LeftButton == MouseButtonState.Pressed )
{
var model = Model;
Expand Down
12 changes: 8 additions & 4 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri
else
{
var width = ( prevChildModel.DockWidth.IsAuto ) ? prevChildActualSize.Width : prevChildModel.DockWidth.Value;
prevChildModel.DockWidth = new GridLength( width + delta, GridUnitType.Pixel );
var resizedWidth = width + delta;
prevChildModel.DockWidth = new GridLength( double.IsNaN(resizedWidth) ? width : resizedWidth, GridUnitType.Pixel );
}

if( nextChildModel.DockWidth.IsStar )
Expand All @@ -426,7 +427,8 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri
else
{
var width = ( nextChildModel.DockWidth.IsAuto ) ? nextChildActualSize.Width : nextChildModel.DockWidth.Value;
nextChildModel.DockWidth = new GridLength( width - delta, GridUnitType.Pixel );
var resizedWidth = width - delta;
nextChildModel.DockWidth = new GridLength( double.IsNaN(resizedWidth) ? width : resizedWidth, GridUnitType.Pixel );
}
}
else
Expand All @@ -438,7 +440,8 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri
else
{
var height = ( prevChildModel.DockHeight.IsAuto ) ? prevChildActualSize.Height : prevChildModel.DockHeight.Value;
prevChildModel.DockHeight = new GridLength( height + delta, GridUnitType.Pixel );
var resizedHeight = height + delta;
prevChildModel.DockHeight = new GridLength( double.IsNaN(resizedHeight) ? height : resizedHeight, GridUnitType.Pixel );
}

if( nextChildModel.DockHeight.IsStar )
Expand All @@ -448,7 +451,8 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri
else
{
var height = ( nextChildModel.DockHeight.IsAuto ) ? nextChildActualSize.Height : nextChildModel.DockHeight.Value;
nextChildModel.DockHeight = new GridLength( height - delta, GridUnitType.Pixel );
var resizedHeight = height - delta;
nextChildModel.DockHeight = new GridLength( double.IsNaN(resizedHeight) ? height : resizedHeight, GridUnitType.Pixel );
}
}

Expand Down
4 changes: 2 additions & 2 deletions ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public GridLength DockWidth
}
set
{
if( DockWidth != value )
if( DockWidth != value && value.Value > 0 )
{
RaisePropertyChanging( "DockWidth" );
_dockWidth = value;
Expand All @@ -74,7 +74,7 @@ public GridLength DockHeight
}
set
{
if( DockHeight != value )
if( DockHeight != value && value.Value > 0 )
{
RaisePropertyChanging( "DockHeight" );
_dockHeight = value;
Expand Down