Fix handlers to match decompiled production code
- ButtonHandler: Removed MapText/TextColor/Font (not in production), fixed namespace - LabelHandler: Added CharacterSpacing/LayoutAlignment/FormattedText, ConnectHandler gesture logic - EntryHandler: Added CharacterSpacing/ClearButtonVisibility/VerticalTextAlignment - EditorHandler: Created from decompiled (was missing) - SliderHandler: Fixed namespace, added ConnectHandler init calls - SwitchHandler: Added OffTrackColor logic, fixed namespace - CheckBoxHandler: Added VerticalLayoutAlignment/HorizontalLayoutAlignment - ProgressBarHandler: Added ConnectHandler/DisconnectHandler IsVisible tracking - PickerHandler: Created from decompiled with collection changed tracking - ActivityIndicatorHandler: Removed IsEnabled/BackgroundColor (not in production) - All handlers now use namespace Microsoft.Maui.Platform.Linux.Handlers - All handlers have proper null checks on PlatformView - Updated MERGE_TRACKING.md with accurate status 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,52 +1,49 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Microsoft.Maui.Controls;
|
||||
using Microsoft.Maui.Graphics;
|
||||
using Microsoft.Maui.Handlers;
|
||||
using Microsoft.Maui.Platform.Linux.Window;
|
||||
using Microsoft.Maui.Primitives;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace Microsoft.Maui.Platform;
|
||||
namespace Microsoft.Maui.Platform.Linux.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// Linux handler for Label control.
|
||||
/// </summary>
|
||||
public partial class LabelHandler : ViewHandler<ILabel, SkiaLabel>
|
||||
public class LabelHandler : ViewHandler<ILabel, SkiaLabel>
|
||||
{
|
||||
/// <summary>
|
||||
/// Maps the property mapper for the handler.
|
||||
/// </summary>
|
||||
public static IPropertyMapper<ILabel, LabelHandler> Mapper = new PropertyMapper<ILabel, LabelHandler>(ViewHandler.ViewMapper)
|
||||
{
|
||||
[nameof(ILabel.Text)] = MapText,
|
||||
[nameof(ILabel.TextColor)] = MapTextColor,
|
||||
[nameof(ILabel.Font)] = MapFont,
|
||||
[nameof(ILabel.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
|
||||
[nameof(ILabel.VerticalTextAlignment)] = MapVerticalTextAlignment,
|
||||
[nameof(ILabel.LineBreakMode)] = MapLineBreakMode,
|
||||
[nameof(ILabel.MaxLines)] = MapMaxLines,
|
||||
[nameof(ILabel.Padding)] = MapPadding,
|
||||
[nameof(ILabel.TextDecorations)] = MapTextDecorations,
|
||||
[nameof(ILabel.LineHeight)] = MapLineHeight,
|
||||
[nameof(ILabel.Background)] = MapBackground,
|
||||
["BackgroundColor"] = MapBackgroundColor,
|
||||
["Text"] = MapText,
|
||||
["TextColor"] = MapTextColor,
|
||||
["Font"] = MapFont,
|
||||
["CharacterSpacing"] = MapCharacterSpacing,
|
||||
["HorizontalTextAlignment"] = MapHorizontalTextAlignment,
|
||||
["VerticalTextAlignment"] = MapVerticalTextAlignment,
|
||||
["TextDecorations"] = MapTextDecorations,
|
||||
["LineHeight"] = MapLineHeight,
|
||||
["LineBreakMode"] = MapLineBreakMode,
|
||||
["MaxLines"] = MapMaxLines,
|
||||
["Padding"] = MapPadding,
|
||||
["Background"] = MapBackground,
|
||||
["VerticalLayoutAlignment"] = MapVerticalLayoutAlignment,
|
||||
["HorizontalLayoutAlignment"] = MapHorizontalLayoutAlignment,
|
||||
["FormattedText"] = MapFormattedText
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Maps the command mapper for the handler.
|
||||
/// </summary>
|
||||
public static CommandMapper<ILabel, LabelHandler> CommandMapper = new(ViewHandler.ViewCommandMapper)
|
||||
{
|
||||
};
|
||||
public static CommandMapper<ILabel, LabelHandler> CommandMapper = new(ViewHandler.ViewCommandMapper);
|
||||
|
||||
public LabelHandler() : base(Mapper, CommandMapper)
|
||||
{
|
||||
}
|
||||
|
||||
public LabelHandler(IPropertyMapper? mapper)
|
||||
: base(mapper ?? Mapper, CommandMapper)
|
||||
{
|
||||
}
|
||||
|
||||
public LabelHandler(IPropertyMapper? mapper, CommandMapper? commandMapper)
|
||||
public LabelHandler(IPropertyMapper? mapper, CommandMapper? commandMapper = null)
|
||||
: base(mapper ?? Mapper, commandMapper ?? CommandMapper)
|
||||
{
|
||||
}
|
||||
@@ -56,119 +53,263 @@ public partial class LabelHandler : ViewHandler<ILabel, SkiaLabel>
|
||||
return new SkiaLabel();
|
||||
}
|
||||
|
||||
protected override void ConnectHandler(SkiaLabel platformView)
|
||||
{
|
||||
base.ConnectHandler(platformView);
|
||||
|
||||
if (VirtualView is View view)
|
||||
{
|
||||
platformView.MauiView = view;
|
||||
if (view.GestureRecognizers.OfType<TapGestureRecognizer>().Any())
|
||||
{
|
||||
platformView.CursorType = CursorType.Hand;
|
||||
}
|
||||
}
|
||||
|
||||
platformView.Tapped += OnPlatformViewTapped;
|
||||
}
|
||||
|
||||
protected override void DisconnectHandler(SkiaLabel platformView)
|
||||
{
|
||||
platformView.Tapped -= OnPlatformViewTapped;
|
||||
platformView.MauiView = null;
|
||||
base.DisconnectHandler(platformView);
|
||||
}
|
||||
|
||||
private void OnPlatformViewTapped(object? sender, EventArgs e)
|
||||
{
|
||||
if (VirtualView is View view)
|
||||
{
|
||||
GestureManager.ProcessTap(view, 0.0, 0.0);
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapText(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.Text = label.Text ?? "";
|
||||
handler.PlatformView.Invalidate();
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.Text = label.Text ?? string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapTextColor(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (label.TextColor != null)
|
||||
if (handler.PlatformView != null && label.TextColor != null)
|
||||
{
|
||||
handler.PlatformView.TextColor = label.TextColor.ToSKColor();
|
||||
}
|
||||
handler.PlatformView.Invalidate();
|
||||
}
|
||||
|
||||
public static void MapFont(LabelHandler handler, ILabel label)
|
||||
{
|
||||
var font = label.Font;
|
||||
if (font.Family != null)
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.FontFamily = font.Family;
|
||||
var font = label.Font;
|
||||
if (font.Size > 0)
|
||||
{
|
||||
handler.PlatformView.FontSize = (float)font.Size;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(font.Family))
|
||||
{
|
||||
handler.PlatformView.FontFamily = font.Family;
|
||||
}
|
||||
handler.PlatformView.IsBold = (int)font.Weight >= 700;
|
||||
handler.PlatformView.IsItalic = font.Slant == FontSlant.Italic || font.Slant == FontSlant.Oblique;
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapCharacterSpacing(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.CharacterSpacing = (float)label.CharacterSpacing;
|
||||
}
|
||||
handler.PlatformView.FontSize = (float)font.Size;
|
||||
handler.PlatformView.IsBold = font.Weight == FontWeight.Bold;
|
||||
handler.PlatformView.IsItalic = font.Slant == FontSlant.Italic;
|
||||
handler.PlatformView.Invalidate();
|
||||
}
|
||||
|
||||
public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.HorizontalTextAlignment = label.HorizontalTextAlignment switch
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
Microsoft.Maui.TextAlignment.Start => TextAlignment.Start,
|
||||
Microsoft.Maui.TextAlignment.Center => TextAlignment.Center,
|
||||
Microsoft.Maui.TextAlignment.End => TextAlignment.End,
|
||||
_ => TextAlignment.Start
|
||||
};
|
||||
handler.PlatformView.Invalidate();
|
||||
handler.PlatformView.HorizontalTextAlignment = (int)label.HorizontalTextAlignment switch
|
||||
{
|
||||
0 => TextAlignment.Start,
|
||||
1 => TextAlignment.Center,
|
||||
2 => TextAlignment.End,
|
||||
_ => TextAlignment.Start
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapVerticalTextAlignment(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.VerticalTextAlignment = label.VerticalTextAlignment switch
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
Microsoft.Maui.TextAlignment.Start => TextAlignment.Start,
|
||||
Microsoft.Maui.TextAlignment.Center => TextAlignment.Center,
|
||||
Microsoft.Maui.TextAlignment.End => TextAlignment.End,
|
||||
_ => TextAlignment.Center
|
||||
};
|
||||
handler.PlatformView.Invalidate();
|
||||
}
|
||||
|
||||
public static void MapLineBreakMode(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.LineBreakMode = label.LineBreakMode switch
|
||||
{
|
||||
Microsoft.Maui.LineBreakMode.NoWrap => LineBreakMode.NoWrap,
|
||||
Microsoft.Maui.LineBreakMode.WordWrap => LineBreakMode.WordWrap,
|
||||
Microsoft.Maui.LineBreakMode.CharacterWrap => LineBreakMode.CharacterWrap,
|
||||
Microsoft.Maui.LineBreakMode.HeadTruncation => LineBreakMode.HeadTruncation,
|
||||
Microsoft.Maui.LineBreakMode.TailTruncation => LineBreakMode.TailTruncation,
|
||||
Microsoft.Maui.LineBreakMode.MiddleTruncation => LineBreakMode.MiddleTruncation,
|
||||
_ => LineBreakMode.TailTruncation
|
||||
};
|
||||
handler.PlatformView.Invalidate();
|
||||
}
|
||||
|
||||
public static void MapMaxLines(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.MaxLines = label.MaxLines;
|
||||
handler.PlatformView.Invalidate();
|
||||
}
|
||||
|
||||
public static void MapPadding(LabelHandler handler, ILabel label)
|
||||
{
|
||||
var padding = label.Padding;
|
||||
handler.PlatformView.Padding = new SKRect(
|
||||
(float)padding.Left,
|
||||
(float)padding.Top,
|
||||
(float)padding.Right,
|
||||
(float)padding.Bottom);
|
||||
handler.PlatformView.Invalidate();
|
||||
handler.PlatformView.VerticalTextAlignment = (int)label.VerticalTextAlignment switch
|
||||
{
|
||||
0 => TextAlignment.Start,
|
||||
1 => TextAlignment.Center,
|
||||
2 => TextAlignment.End,
|
||||
_ => TextAlignment.Center
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapTextDecorations(LabelHandler handler, ILabel label)
|
||||
{
|
||||
var decorations = label.TextDecorations;
|
||||
handler.PlatformView.IsUnderline = decorations.HasFlag(TextDecorations.Underline);
|
||||
handler.PlatformView.IsStrikethrough = decorations.HasFlag(TextDecorations.Strikethrough);
|
||||
handler.PlatformView.Invalidate();
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.IsUnderline = (label.TextDecorations & TextDecorations.Underline) != 0;
|
||||
handler.PlatformView.IsStrikethrough = (label.TextDecorations & TextDecorations.Strikethrough) != 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapLineHeight(LabelHandler handler, ILabel label)
|
||||
{
|
||||
handler.PlatformView.LineHeight = (float)label.LineHeight;
|
||||
handler.PlatformView.Invalidate();
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.LineHeight = (float)label.LineHeight;
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapLineBreakMode(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
if (label is Label mauiLabel)
|
||||
{
|
||||
handler.PlatformView.LineBreakMode = (int)mauiLabel.LineBreakMode switch
|
||||
{
|
||||
0 => LineBreakMode.NoWrap,
|
||||
1 => LineBreakMode.WordWrap,
|
||||
2 => LineBreakMode.CharacterWrap,
|
||||
3 => LineBreakMode.HeadTruncation,
|
||||
4 => LineBreakMode.TailTruncation,
|
||||
5 => LineBreakMode.MiddleTruncation,
|
||||
_ => LineBreakMode.TailTruncation
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapMaxLines(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
if (label is Label mauiLabel)
|
||||
{
|
||||
handler.PlatformView.MaxLines = mauiLabel.MaxLines;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapPadding(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
var padding = label.Padding;
|
||||
handler.PlatformView.Padding = new SKRect(
|
||||
(float)padding.Left,
|
||||
(float)padding.Top,
|
||||
(float)padding.Right,
|
||||
(float)padding.Bottom);
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapBackground(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (label.Background is SolidColorBrush solidBrush && solidBrush.Color != null)
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.BackgroundColor = solidBrush.Color.ToSKColor();
|
||||
handler.PlatformView.Invalidate();
|
||||
if (label.Background is SolidPaint solidPaint && solidPaint.Color != null)
|
||||
{
|
||||
handler.PlatformView.BackgroundColor = solidPaint.Color.ToSKColor();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapBackgroundColor(LabelHandler handler, ILabel label)
|
||||
public static void MapVerticalLayoutAlignment(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (label is Microsoft.Maui.Controls.VisualElement ve && ve.BackgroundColor != null)
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.BackgroundColor = ve.BackgroundColor.ToSKColor();
|
||||
handler.PlatformView.Invalidate();
|
||||
handler.PlatformView.VerticalOptions = (int)label.VerticalLayoutAlignment switch
|
||||
{
|
||||
1 => LayoutOptions.Start,
|
||||
2 => LayoutOptions.Center,
|
||||
3 => LayoutOptions.End,
|
||||
0 => LayoutOptions.Fill,
|
||||
_ => LayoutOptions.Start
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapHorizontalLayoutAlignment(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView != null)
|
||||
{
|
||||
handler.PlatformView.HorizontalOptions = (int)label.HorizontalLayoutAlignment switch
|
||||
{
|
||||
1 => LayoutOptions.Start,
|
||||
2 => LayoutOptions.Center,
|
||||
3 => LayoutOptions.End,
|
||||
0 => LayoutOptions.Fill,
|
||||
_ => LayoutOptions.Start
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public static void MapFormattedText(LabelHandler handler, ILabel label)
|
||||
{
|
||||
if (handler.PlatformView == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (label is not Label mauiLabel)
|
||||
{
|
||||
handler.PlatformView.FormattedSpans = null;
|
||||
return;
|
||||
}
|
||||
|
||||
var formattedText = mauiLabel.FormattedText;
|
||||
if (formattedText == null || formattedText.Spans.Count == 0)
|
||||
{
|
||||
handler.PlatformView.FormattedSpans = null;
|
||||
return;
|
||||
}
|
||||
|
||||
var spans = new List<SkiaTextSpan>();
|
||||
foreach (var span in formattedText.Spans)
|
||||
{
|
||||
var skiaSpan = new SkiaTextSpan
|
||||
{
|
||||
Text = span.Text ?? "",
|
||||
IsBold = span.FontAttributes.HasFlag(FontAttributes.Bold),
|
||||
IsItalic = span.FontAttributes.HasFlag(FontAttributes.Italic),
|
||||
IsUnderline = (span.TextDecorations & TextDecorations.Underline) != 0,
|
||||
IsStrikethrough = (span.TextDecorations & TextDecorations.Strikethrough) != 0,
|
||||
CharacterSpacing = (float)span.CharacterSpacing,
|
||||
LineHeight = (float)span.LineHeight
|
||||
};
|
||||
|
||||
if (span.TextColor != null)
|
||||
{
|
||||
skiaSpan.TextColor = span.TextColor.ToSKColor();
|
||||
}
|
||||
if (span.BackgroundColor != null)
|
||||
{
|
||||
skiaSpan.BackgroundColor = span.BackgroundColor.ToSKColor();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(span.FontFamily))
|
||||
{
|
||||
skiaSpan.FontFamily = span.FontFamily;
|
||||
}
|
||||
if (span.FontSize > 0)
|
||||
{
|
||||
skiaSpan.FontSize = (float)span.FontSize;
|
||||
}
|
||||
|
||||
spans.Add(skiaSpan);
|
||||
}
|
||||
|
||||
handler.PlatformView.FormattedSpans = spans;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user