Browse Source

Merge pull request #467 from Seeker1437/designer-sizetocontent

Corrects loading paml files and content sizing for Windows and UserControls
pull/472/head
Nikita Tsukanov 10 years ago
parent
commit
b3d9be3e23
  1. 2
      src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
  2. 3
      src/Perspex.Application/Designer/DesignerAssist.cs

2
src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs

@ -182,7 +182,7 @@ namespace Perspex.Markup.Xaml
var asm = type.GetTypeInfo().Assembly.GetName().Name;
var typeName = type.FullName;
yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm);
yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm);
yield return new Uri("resm:" + typeName + ".paml?assembly=" + asm);
}
}

3
src/Perspex.Application/Designer/DesignerAssist.cs

@ -78,6 +78,9 @@ namespace Perspex.DesignerSupport
{
window = new Window() {Content = original};
}
if (!window.IsSet(Window.SizeToContentProperty))
window.SizeToContent = SizeToContent.WidthAndHeight;
}
s_currentWindow?.Close();

Loading…
Cancel
Save