|
|
@ -52,14 +52,13 @@ namespace Xceed.Wpf.AvalonDock.Controls |
|
|
var childContainerModel = _model.Children[i] as ILayoutContainer; |
|
|
var childContainerModel = _model.Children[i] as ILayoutContainer; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
|
|
|
|
|
|
|
|
|
if (childPositionableModel.ForceFixedDockSize) |
|
|
|
|
|
{ |
|
|
if (childContainerModel != null && |
|
|
if (childContainerModel != null && |
|
|
(childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() || |
|
|
(childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() || |
|
|
childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())) |
|
|
childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())) { |
|
|
{ |
|
|
|
|
|
childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star); |
|
|
childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star); |
|
|
} |
|
|
} else if (childPositionableModel != null && childPositionableModel.DockWidth.IsStar) { |
|
|
else if (childPositionableModel != null && childPositionableModel.DockWidth.IsStar) |
|
|
|
|
|
{ |
|
|
|
|
|
var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize; |
|
|
var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize; |
|
|
|
|
|
|
|
|
var widthToSet = Math.Max(childPositionableModelWidthActualSize.ActualWidth, childPositionableModel.DockMinWidth); |
|
|
var widthToSet = Math.Max(childPositionableModelWidthActualSize.ActualWidth, childPositionableModel.DockMinWidth); |
|
|
@ -73,12 +72,13 @@ namespace Xceed.Wpf.AvalonDock.Controls |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
for (int i = 0; i < _model.Children.Count; i++) |
|
|
for (int i = 0; i < _model.Children.Count; i++) |
|
|
{ |
|
|
{ |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
if (!childPositionableModel.DockWidth.IsStar) |
|
|
if (childPositionableModel.ForceFixedDockSize && !childPositionableModel.DockWidth.IsStar) |
|
|
{ |
|
|
{ |
|
|
childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star); |
|
|
childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star); |
|
|
} |
|
|
} |
|
|
@ -94,14 +94,13 @@ namespace Xceed.Wpf.AvalonDock.Controls |
|
|
var childContainerModel = _model.Children[i] as ILayoutContainer; |
|
|
var childContainerModel = _model.Children[i] as ILayoutContainer; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
|
|
|
|
|
|
|
|
|
if (childPositionableModel.ForceFixedDockSize) |
|
|
|
|
|
{ |
|
|
if (childContainerModel != null && |
|
|
if (childContainerModel != null && |
|
|
(childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() || |
|
|
(childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() || |
|
|
childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())) |
|
|
childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())) { |
|
|
{ |
|
|
|
|
|
childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star); |
|
|
childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star); |
|
|
} |
|
|
} else if (childPositionableModel != null && childPositionableModel.DockHeight.IsStar) { |
|
|
else if (childPositionableModel != null && childPositionableModel.DockHeight.IsStar) |
|
|
|
|
|
{ |
|
|
|
|
|
var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize; |
|
|
var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize; |
|
|
|
|
|
|
|
|
var heightToSet = Math.Max(childPositionableModelWidthActualSize.ActualHeight, childPositionableModel.DockMinHeight); |
|
|
var heightToSet = Math.Max(childPositionableModelWidthActualSize.ActualHeight, childPositionableModel.DockMinHeight); |
|
|
@ -112,12 +111,13 @@ namespace Xceed.Wpf.AvalonDock.Controls |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
for (int i = 0; i < _model.Children.Count; i++) |
|
|
for (int i = 0; i < _model.Children.Count; i++) |
|
|
{ |
|
|
{ |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
var childPositionableModel = _model.Children[i] as ILayoutPositionableElement; |
|
|
if (!childPositionableModel.DockHeight.IsStar) |
|
|
if (childPositionableModel.ForceFixedDockSize && !childPositionableModel.DockHeight.IsStar) |
|
|
{ |
|
|
{ |
|
|
childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star); |
|
|
childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star); |
|
|
} |
|
|
} |
|
|
|