From f6ef5d3698d7bbde97d11dc490f60e7002a0f3ae Mon Sep 17 00:00:00 2001 From: Darnell Williams Date: Sun, 6 Mar 2016 17:09:22 -0500 Subject: [PATCH 1/2] Corrects loading paml files and content sizing for usercontrols --- src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs | 2 +- src/Perspex.Application/Designer/DesignerAssist.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs index 7d141fd890..1c27c00d1b 100644 --- a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs +++ b/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); } } diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.Application/Designer/DesignerAssist.cs index 49015d971f..d0dc3c844c 100644 --- a/src/Perspex.Application/Designer/DesignerAssist.cs +++ b/src/Perspex.Application/Designer/DesignerAssist.cs @@ -76,7 +76,7 @@ namespace Perspex.DesignerSupport if (window == null) { - window = new Window() {Content = original}; + window = new Window() {Content = original, SizeToContent = SizeToContent.WidthAndHeight}; } } From 9935ffe9c48bf10617e4386146c37e693d90820b Mon Sep 17 00:00:00 2001 From: Darnell Williams Date: Sun, 6 Mar 2016 17:16:48 -0500 Subject: [PATCH 2/2] Corrects SizeToContent for both windows and control wrppers --- src/Perspex.Application/Designer/DesignerAssist.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.Application/Designer/DesignerAssist.cs index d0dc3c844c..de5518317f 100644 --- a/src/Perspex.Application/Designer/DesignerAssist.cs +++ b/src/Perspex.Application/Designer/DesignerAssist.cs @@ -76,8 +76,11 @@ namespace Perspex.DesignerSupport if (window == null) { - window = new Window() {Content = original, SizeToContent = SizeToContent.WidthAndHeight}; + window = new Window() {Content = original}; } + + if (!window.IsSet(Window.SizeToContentProperty)) + window.SizeToContent = SizeToContent.WidthAndHeight; } s_currentWindow?.Close();