diff --git a/src/Core/src/Graphics/PaintExtensions.Tizen.cs b/src/Core/src/Graphics/PaintExtensions.Tizen.cs index 5436b8fe8a46..c986bfc90562 100644 --- a/src/Core/src/Graphics/PaintExtensions.Tizen.cs +++ b/src/Core/src/Graphics/PaintExtensions.Tizen.cs @@ -12,15 +12,6 @@ class BackgroundDrawable : IDrawable Paint _paint; public BackgroundDrawable(Paint paint) { - // Workaround. - // I think, SolidPaint violate LSP - // When Paint was used on Canvas.SetFillPaint, BackgroundColor was referred - // But SolidPaint do not update BackgroundColor when Color was updated even though it has same meaning. - if (paint is SolidPaint solidPaint) - { - solidPaint.BackgroundColor = solidPaint.Color; - } - _paint = paint; } diff --git a/src/Core/src/Handlers/Border/BorderHandler.cs b/src/Core/src/Handlers/Border/BorderHandler.cs index 7e9fe0c63f96..f494e632aa60 100644 --- a/src/Core/src/Handlers/Border/BorderHandler.cs +++ b/src/Core/src/Handlers/Border/BorderHandler.cs @@ -5,6 +5,8 @@ using NativeView = Microsoft.Maui.Handlers.ContentViewGroup; #elif WINDOWS using NativeView = Microsoft.Maui.Handlers.ContentPanel; +#elif TIZEN +using NativeView = Microsoft.Maui.ContentCanvas; #elif NETSTANDARD using NativeView = System.Object; #endif diff --git a/src/Core/src/Handlers/GraphicsView/GraphicsViewHandler.Tizen.cs b/src/Core/src/Handlers/GraphicsView/GraphicsViewHandler.Tizen.cs index f8284d5081bf..361bb245017e 100644 --- a/src/Core/src/Handlers/GraphicsView/GraphicsViewHandler.Tizen.cs +++ b/src/Core/src/Handlers/GraphicsView/GraphicsViewHandler.Tizen.cs @@ -1,5 +1,4 @@ using Microsoft.Maui.Graphics.Skia.Views; -using SkiaGraphicsView = Microsoft.Maui.Platform.Tizen.SkiaGraphicsView; namespace Microsoft.Maui.Handlers { @@ -7,10 +6,7 @@ public partial class GraphicsViewHandler : ViewHandler _drawable; - set - { - _drawable = value; - Invalidate(); - } - } - - protected virtual void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e) - { - if (_drawable == null) return; - - var skiaCanvas = e.Surface.Canvas; - skiaCanvas.Clear(); - - _canvas.Canvas = skiaCanvas; - _scalingCanvas.ResetState(); - - float width = e.Info.Width; - float height = e.Info.Height; - if (DeviceScalingFactor > 0) - { - width = width / DeviceScalingFactor; - height = height / DeviceScalingFactor; - } - - _scalingCanvas.SaveState(); - if (DeviceScalingFactor > 0) - _scalingCanvas.Scale(DeviceScalingFactor, DeviceScalingFactor); - _drawable.Draw(_scalingCanvas, new RectangleF(0, 0, width, height)); - _scalingCanvas.RestoreState(); - } - } -} diff --git a/src/Core/src/Platform/Tizen/WrapperView.cs b/src/Core/src/Platform/Tizen/WrapperView.cs index a5a603edecee..65d2faf02527 100644 --- a/src/Core/src/Platform/Tizen/WrapperView.cs +++ b/src/Core/src/Platform/Tizen/WrapperView.cs @@ -7,7 +7,6 @@ using SkiaSharp.Views.Tizen; using Tizen.UIExtensions.Common; using Tizen.UIExtensions.ElmSharp; -using SkiaGraphicsView = Microsoft.Maui.Platform.Tizen.SkiaGraphicsView; namespace Microsoft.Maui { @@ -26,10 +25,7 @@ public WrapperView(EvasObject parent) : base(parent) { _backgroundCanvas = new Lazy(() => { - var view = new SkiaGraphicsView(parent) - { - DeviceScalingFactor = (float)DeviceInfo.ScalingFactor - }; + var view = new SkiaGraphicsView(parent); view.Show(); Children.Add(view); view.Lower();