Browse Source

Only set SizeToContent for non-set width/height.

Always setting `SizeToContext = WidthAndHeight` was causing `Grid` to default to `Auto` sizing for `Star` rows/columns at design-time.

Fixes #2862
pull/3081/head
Steven Kirk 7 years ago
parent
commit
b7efe2037c
  1. 12
      src/Avalonia.DesignerSupport/DesignWindowLoader.cs

12
src/Avalonia.DesignerSupport/DesignWindowLoader.cs

@ -69,7 +69,17 @@ namespace Avalonia.DesignerSupport
}
if (!window.IsSet(Window.SizeToContentProperty))
window.SizeToContent = SizeToContent.WidthAndHeight;
{
if (double.IsNaN(window.Width))
{
window.SizeToContent |= SizeToContent.Width;
}
if (double.IsNaN(window.Height))
{
window.SizeToContent |= SizeToContent.Height;
}
}
}
window.Show();
Design.ApplyDesignModeProperties(window, control);

Loading…
Cancel
Save