summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSungHyun Min <shyun.min@samsung.com>2017-07-05 07:35:46 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-07-10 02:11:29 (GMT)
commit82fd1275fb813070cc420aedaa643e86d4e7e069 (patch)
treebc8c95097db2ba4b6c83f882f8ddbb75aa1c62ca
parenta0eafa63f4994dee7bbabf1ef916f520a0f68182 (diff)
downloadxamarin-forms-82fd1275fb813070cc420aedaa643e86d4e7e069.zip
xamarin-forms-82fd1275fb813070cc420aedaa643e86d4e7e069.tar.gz
xamarin-forms-82fd1275fb813070cc420aedaa643e86d4e7e069.tar.bz2
Fix Editor cursor position issue
TASK=TCAPI2439 Change-Id: I6cf8ba60d74b0cd3fc72e86f1336127cdc5e5559
-rw-r--r--[-rwxr-xr-x]Xamarin.Forms.Platform.Tizen/Native/Span.cs12
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs10
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs8
3 files changed, 22 insertions, 8 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Span.cs b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
index 3ffea25..cf5299f 100755..100644
--- a/Xamarin.Forms.Platform.Tizen/Native/Span.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
@@ -186,7 +186,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native
else
{
// FontWeight is only available in case of FontAttributes.Bold is not used.
- if(FontWeight != Specific.FontWeight.None)
+ if (FontWeight != Specific.FontWeight.None)
{
_formattingString.AppendFormat("font_weight={0} ", FontWeight);
}
@@ -244,19 +244,25 @@ namespace Xamarin.Forms.Platform.Tizen.Native
case LineBreakMode.TailTruncation:
_formattingString.Append("ellipsis=1.0");
break;
+
case LineBreakMode.CharacterWrap:
_formattingString.Append("wrap=char");
break;
+
case LineBreakMode.WordWrap:
_formattingString.Append("wrap=word");
break;
+
case LineBreakMode.MixedWrap:
_formattingString.Append("wrap=mixed");
break;
+
case LineBreakMode.NoWrap:
- case LineBreakMode.None:
_formattingString.Append("wrap=none");
break;
+
+ case LineBreakMode.None:
+ break;
}
return _formattingString;
@@ -292,4 +298,4 @@ namespace Xamarin.Forms.Platform.Tizen.Native
return new Span { Text = text };
}
}
-}
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
index d5ca750..39e018c 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
@@ -1,4 +1,4 @@
-´╗┐using System;
+using System;
using Xamarin.Forms.Platform.Tizen.Native;
using EColor = ElmSharp.Color;
@@ -32,6 +32,7 @@ namespace Xamarin.Forms.Platform.Tizen
}
base.OnElementChanged(e);
}
+
protected override void Dispose(bool disposing)
{
if (disposing)
@@ -58,6 +59,10 @@ namespace Xamarin.Forms.Platform.Tizen
void UpdateText()
{
Control.Text = Element.Text;
+ if (!Control.IsFocused)
+ {
+ Control.MoveCursorEnd();
+ }
}
void UpdateTextColor()
@@ -88,5 +93,4 @@ namespace Xamarin.Forms.Platform.Tizen
Control.Keyboard = Element.Keyboard.ToNative();
}
}
-}
-
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
index 23ffca5..842aae8 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
@@ -18,7 +18,7 @@ namespace Xamarin.Forms.Platform.Tizen
RegisterPropertyHandler(Entry.KeyboardProperty, UpdateKeyboard);
RegisterPropertyHandler(Entry.PlaceholderProperty, UpdatePlaceholder);
RegisterPropertyHandler(Entry.PlaceholderColorProperty, UpdatePlaceholderColor);
- if(TizenPlatformServices.AppDomain.IsTizenSpecificAvailable)
+ if (TizenPlatformServices.AppDomain.IsTizenSpecificAvailable)
{
RegisterPropertyHandler("FontWeight", UpdateFontWeight);
}
@@ -77,6 +77,10 @@ namespace Xamarin.Forms.Platform.Tizen
void UpdateText()
{
Control.Text = Element.Text;
+ if (!Control.IsFocused)
+ {
+ Control.MoveCursorEnd();
+ }
}
void UpdateTextColor()
@@ -127,4 +131,4 @@ namespace Xamarin.Forms.Platform.Tizen
Control.FontWeight = Specific.GetFontWeight(Element);
}
}
-}
+} \ No newline at end of file