From f8d7a942ab84fab97a7e383c47587867041e801b Mon Sep 17 00:00:00 2001 From: Oleksandr Liakhevych Date: Fri, 3 Jan 2025 18:22:11 +0200 Subject: [PATCH] Generator: Fix namespaces --- .../GeneratedTypeInfo.cs | 1 + .../Elements/Border.generated.cs | 13 ++++++------- .../Elements/VisualElement.generated.cs | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs b/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs index abf5040f..b32f4744 100644 --- a/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs +++ b/src/BlazorBindings.Maui.ComponentGenerator/GeneratedTypeInfo.cs @@ -37,6 +37,7 @@ public string GetTypeNameAndAddNamespace(string @namespace, string typeName) { @using = new UsingStatement { Namespace = @namespace, IsUsed = true }; Usings.Add(@using); + return typeName; } return $"global::{@namespace}.{typeName}"; diff --git a/src/BlazorBindings.Maui/Elements/Border.generated.cs b/src/BlazorBindings.Maui/Elements/Border.generated.cs index 106d467b..bd48419c 100644 --- a/src/BlazorBindings.Maui/Elements/Border.generated.cs +++ b/src/BlazorBindings.Maui/Elements/Border.generated.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.Maui; -using Microsoft.Maui.Controls.Shapes; using Microsoft.Maui.Graphics; using System.Threading.Tasks; @@ -28,8 +27,8 @@ static Border() [Parameter] public Thickness? Padding { get; set; } [Parameter] public Color StrokeColor { get; set; } [Parameter] public double? StrokeDashOffset { get; set; } - [Parameter] public PenLineCap? StrokeLineCap { get; set; } - [Parameter] public PenLineJoin? StrokeLineJoin { get; set; } + [Parameter] public MC.Shapes.PenLineCap? StrokeLineCap { get; set; } + [Parameter] public MC.Shapes.PenLineJoin? StrokeLineJoin { get; set; } [Parameter] public double? StrokeMiterLimit { get; set; } [Parameter] public double? StrokeThickness { get; set; } [Parameter] public RenderFragment ChildContent { get; set; } @@ -68,15 +67,15 @@ protected override void HandleParameter(string name, object value) case nameof(StrokeLineCap): if (!Equals(StrokeLineCap, value)) { - StrokeLineCap = (PenLineCap?)value; - NativeControl.StrokeLineCap = StrokeLineCap ?? (PenLineCap)MC.Border.StrokeLineCapProperty.DefaultValue; + StrokeLineCap = (MC.Shapes.PenLineCap?)value; + NativeControl.StrokeLineCap = StrokeLineCap ?? (MC.Shapes.PenLineCap)MC.Border.StrokeLineCapProperty.DefaultValue; } break; case nameof(StrokeLineJoin): if (!Equals(StrokeLineJoin, value)) { - StrokeLineJoin = (PenLineJoin?)value; - NativeControl.StrokeLineJoin = StrokeLineJoin ?? (PenLineJoin)MC.Border.StrokeLineJoinProperty.DefaultValue; + StrokeLineJoin = (MC.Shapes.PenLineJoin?)value; + NativeControl.StrokeLineJoin = StrokeLineJoin ?? (MC.Shapes.PenLineJoin)MC.Border.StrokeLineJoinProperty.DefaultValue; } break; case nameof(StrokeMiterLimit): diff --git a/src/BlazorBindings.Maui/Elements/VisualElement.generated.cs b/src/BlazorBindings.Maui/Elements/VisualElement.generated.cs index f19ad409..f96c6f93 100644 --- a/src/BlazorBindings.Maui/Elements/VisualElement.generated.cs +++ b/src/BlazorBindings.Maui/Elements/VisualElement.generated.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.Maui; -using Microsoft.Maui.Controls.Shapes; using Microsoft.Maui.Graphics; using System; using System.Threading.Tasks; @@ -425,7 +424,7 @@ protected override void RenderAdditionalElementContent(RenderTreeBuilder builder base.RenderAdditionalElementContent(builder, ref sequence); RenderTreeBuilderHelper.AddContentProperty(builder, sequence++, Background, (x, value) => x.Background = (MC.Brush)value); RenderTreeBuilderHelper.AddListContentProperty(builder, sequence++, Behaviors, x => x.Behaviors); - RenderTreeBuilderHelper.AddContentProperty(builder, sequence++, Clip, (x, value) => x.Clip = (Geometry)value); + RenderTreeBuilderHelper.AddContentProperty(builder, sequence++, Clip, (x, value) => x.Clip = (MC.Shapes.Geometry)value); RenderTreeBuilderHelper.AddContentProperty(builder, sequence++, Shadow, (x, value) => x.Shadow = (MC.Shadow)value); RenderTreeBuilderHelper.AddListContentProperty(builder, sequence++, Triggers, x => x.Triggers); }