From 0065d62773ba8a69469704627286d1da36cbe00a Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Fri, 11 Jun 2021 09:03:08 -0500 Subject: [PATCH 1/3] Revert WinUI to use DefaultRenderer --- .../Core/src/AppHostBuilderExtensions.Controls.cs | 2 ++ src/Controls/src/Core/AppHostBuilderExtensions.cs | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs index 8b0e3e5079e2..29b215df66a2 100644 --- a/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs +++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs @@ -197,6 +197,8 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder) handlers.TryAddCompatibilityRenderer(typeof(TabbedPage), typeof(TabbedPageRenderer)); handlers.TryAddCompatibilityRenderer(typeof(Shell), typeof(ShellRenderer)); handlers.TryAddCompatibilityRenderer(typeof(OpenGLView), typeof(OpenGLViewRenderer)); +#else + handlers.TryAddCompatibilityRenderer(typeof(Element), typeof(DefaultRenderer)); #endif handlers.TryAddCompatibilityRenderer(typeof(NavigationPage), typeof(NavigationPageRenderer)); handlers.TryAddCompatibilityRenderer(typeof(CarouselPage), typeof(CarouselPageRenderer)); diff --git a/src/Controls/src/Core/AppHostBuilderExtensions.cs b/src/Controls/src/Core/AppHostBuilderExtensions.cs index 7caa259c8fef..ac3be210f8d6 100644 --- a/src/Controls/src/Core/AppHostBuilderExtensions.cs +++ b/src/Controls/src/Core/AppHostBuilderExtensions.cs @@ -25,7 +25,6 @@ public static class AppHostBuilderExtensions { typeof(GraphicsView), typeof(GraphicsViewHandler) }, { typeof(Image), typeof(ImageHandler) }, { typeof(Label), typeof(LabelHandler) }, - { typeof(Layout), typeof(LayoutHandler) }, { typeof(Layout2.Layout), typeof(LayoutHandler) }, { typeof(Picker), typeof(PickerHandler) }, { typeof(ProgressBar), typeof(ProgressBarHandler) }, @@ -41,6 +40,12 @@ public static class AppHostBuilderExtensions { typeof(Shapes.Polygon), typeof(ShapeViewHandler) }, { typeof(Shapes.Polyline), typeof(ShapeViewHandler) }, { typeof(Shapes.Rectangle), typeof(ShapeViewHandler) }, + + // Set LayoutHandler as default Handler +#if !WINDOWS + { typeof(Layout), typeof(LayoutHandler) }, + { typeof(Element), typeof(LayoutHandler) } +#endif }; public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection) From f791246f7dc249f516b97abfb833449a2976ce21 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Fri, 11 Jun 2021 09:14:04 -0500 Subject: [PATCH 2/3] - register layout renderer for winui --- .../Core/src/AppHostBuilderExtensions.Controls.cs | 2 +- src/Controls/src/Core/AppHostBuilderExtensions.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs index 29b215df66a2..e313705146e8 100644 --- a/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs +++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.Controls.cs @@ -198,7 +198,7 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder) handlers.TryAddCompatibilityRenderer(typeof(Shell), typeof(ShellRenderer)); handlers.TryAddCompatibilityRenderer(typeof(OpenGLView), typeof(OpenGLViewRenderer)); #else - handlers.TryAddCompatibilityRenderer(typeof(Element), typeof(DefaultRenderer)); + handlers.TryAddCompatibilityRenderer(typeof(Layout), typeof(LayoutRenderer)); #endif handlers.TryAddCompatibilityRenderer(typeof(NavigationPage), typeof(NavigationPageRenderer)); handlers.TryAddCompatibilityRenderer(typeof(CarouselPage), typeof(CarouselPageRenderer)); diff --git a/src/Controls/src/Core/AppHostBuilderExtensions.cs b/src/Controls/src/Core/AppHostBuilderExtensions.cs index ac3be210f8d6..54efe4ef7025 100644 --- a/src/Controls/src/Core/AppHostBuilderExtensions.cs +++ b/src/Controls/src/Core/AppHostBuilderExtensions.cs @@ -41,11 +41,13 @@ public static class AppHostBuilderExtensions { typeof(Shapes.Polyline), typeof(ShapeViewHandler) }, { typeof(Shapes.Rectangle), typeof(ShapeViewHandler) }, - // Set LayoutHandler as default Handler -#if !WINDOWS + #if !WINDOWS { typeof(Layout), typeof(LayoutHandler) }, - { typeof(Element), typeof(LayoutHandler) } -#endif + #endif + + // Set LayoutHandler as default Handler, + { typeof(Element), typeof(LayoutHandler) }, + }; public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection) From 69fae8538749ed69af40b2784a52788dd2e8ffcb Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Fri, 11 Jun 2021 11:01:51 -0500 Subject: [PATCH 3/3] - remove default handler --- src/Controls/src/Core/AppHostBuilderExtensions.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Controls/src/Core/AppHostBuilderExtensions.cs b/src/Controls/src/Core/AppHostBuilderExtensions.cs index 54efe4ef7025..cf175848f4a1 100644 --- a/src/Controls/src/Core/AppHostBuilderExtensions.cs +++ b/src/Controls/src/Core/AppHostBuilderExtensions.cs @@ -45,9 +45,6 @@ public static class AppHostBuilderExtensions { typeof(Layout), typeof(LayoutHandler) }, #endif - // Set LayoutHandler as default Handler, - { typeof(Element), typeof(LayoutHandler) }, - }; public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection)