diff --git a/src/Compatibility/Core/src/Tizen/Renderers/LabelRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/LabelRenderer.cs index f83871660d24..a1f225f8c842 100644 --- a/src/Compatibility/Core/src/Tizen/Renderers/LabelRenderer.cs +++ b/src/Compatibility/Core/src/Tizen/Renderers/LabelRenderer.cs @@ -80,6 +80,7 @@ void UpdateFormattedText() Control.FormattedText = ConvertFormattedText(Element.FormattedText); } + [PortHandler] void UpdateText() { Control.Text = Element.Text ?? ""; diff --git a/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs b/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs index 4cb4c199856c..16e5d3887beb 100644 --- a/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs +++ b/src/Controls/src/Core/HandlerImpl/Label/Label.Tizen.cs @@ -16,8 +16,6 @@ public static void RemapForControls() [nameof(TextType)] = MapTextType, [nameof(Text)] = MapText, [nameof(TextDecorations)] = MapTextDecorations, - [nameof(CharacterSpacing)] = MapCharacterSpacing, - [nameof(LineHeight)] = MapLineHeight, [nameof(ILabel.Font)] = MapFont, [nameof(TextColor)] = MapTextColor }; @@ -45,26 +43,6 @@ public static void MapTextDecorations(LabelHandler handler, Label label) LabelHandler.MapTextDecorations(handler, label); } - public static void MapCharacterSpacing(LabelHandler handler, Label label) - { - if (label?.TextType == TextType.Html) - { - return; - } - - LabelHandler.MapCharacterSpacing(handler, label); - } - - public static void MapLineHeight(LabelHandler handler, Label label) - { - if (label?.TextType == TextType.Html) - { - return; - } - - LabelHandler.MapLineHeight(handler, label); - } - public static void MapFont(LabelHandler handler, Label label) { if (label?.TextType == TextType.Html) diff --git a/src/Core/src/Platform/Tizen/EntryExtensions.cs b/src/Core/src/Platform/Tizen/EntryExtensions.cs index ed5ec0a02e08..6e5c900a2f81 100644 --- a/src/Core/src/Platform/Tizen/EntryExtensions.cs +++ b/src/Core/src/Platform/Tizen/EntryExtensions.cs @@ -61,7 +61,7 @@ public static void UpdateClearButtonVisibility(this Entry nativeEntry, IEntry en public static void UpdateFont(this Entry nativeEntry, ITextStyle textStyle, IFontManager fontManager) { nativeEntry.BatchBegin(); - nativeEntry.FontSize = textStyle.Font.Size; + nativeEntry.FontSize = textStyle.Font.Size > 0 ? textStyle.Font.Size : 25.ToDPFont(); nativeEntry.FontAttributes = textStyle.Font.GetFontAttributes(); nativeEntry.FontFamily = fontManager.GetFontFamily(textStyle.Font.Family) ?? ""; nativeEntry.BatchCommit(); diff --git a/src/Core/src/Platform/Tizen/LabelExtensions.cs b/src/Core/src/Platform/Tizen/LabelExtensions.cs index a514dcbaa3a0..126670efb983 100644 --- a/src/Core/src/Platform/Tizen/LabelExtensions.cs +++ b/src/Core/src/Platform/Tizen/LabelExtensions.cs @@ -20,7 +20,7 @@ public static void UpdateTextColor(this Label nativeLabel, ILabel label) public static void UpdateFont(this Label nativeLabel, ILabel label, IFontManager fontManager) { nativeLabel.BatchBegin(); - nativeLabel.FontSize = label.Font.Size; + nativeLabel.FontSize = label.Font.Size > 0 ? label.Font.Size : 25.ToDPFont(); nativeLabel.FontAttributes = label.Font.GetFontAttributes(); nativeLabel.FontFamily = fontManager.GetFontFamily(label.Font.Family)??""; nativeLabel.BatchCommit();