Browse Source

Merge d2dc39145f into 837ab3fccc

pull/1212/merge
Dmitry 9 years ago
committed by GitHub
parent
commit
1231abeb11
  1. 6
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs

6
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs

@ -301,7 +301,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
writer.WriteAttributeString("DockHeight", _gridLengthConverter.ConvertToInvariantString(DockHeight)); writer.WriteAttributeString("DockHeight", _gridLengthConverter.ConvertToInvariantString(DockHeight));
if (DockMinWidth != 25.0) if (DockMinWidth != 25.0)
writer.WriteAttributeString("DocMinWidth", DockMinWidth.ToString(CultureInfo.InvariantCulture)); writer.WriteAttributeString("DockMinWidth", DockMinWidth.ToString(CultureInfo.InvariantCulture));
if (DockMinHeight != 25.0) if (DockMinHeight != 25.0)
writer.WriteAttributeString("DockMinHeight", DockMinHeight.ToString(CultureInfo.InvariantCulture)); writer.WriteAttributeString("DockMinHeight", DockMinHeight.ToString(CultureInfo.InvariantCulture));
@ -327,9 +327,9 @@ namespace Xceed.Wpf.AvalonDock.Layout
if (reader.MoveToAttribute("DockHeight")) if (reader.MoveToAttribute("DockHeight"))
_dockHeight = (GridLength)_gridLengthConverter.ConvertFromInvariantString(reader.Value); _dockHeight = (GridLength)_gridLengthConverter.ConvertFromInvariantString(reader.Value);
if (reader.MoveToAttribute("DocMinWidth")) if (reader.MoveToAttribute("DockMinWidth"))
_dockMinWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture); _dockMinWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
if (reader.MoveToAttribute("DocMinHeight")) if (reader.MoveToAttribute("DockMinHeight"))
_dockMinHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture); _dockMinHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
if (reader.MoveToAttribute("FloatingWidth")) if (reader.MoveToAttribute("FloatingWidth"))

Loading…
Cancel
Save