Merge pull request xamarin#16 from jsuarezruiz/gtk-label-render-issues

LabelRenderer review
PlainConcepts · Jun 28, 2017 · 11f0596 · 11f0596
2 parents 7e584c0 + 7895e84
commit 11f0596
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs b/Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs
@@ -93,19 +93,11 @@ public void OpenUriAction(Uri uri)
 
         public void StartTimer(TimeSpan interval, Func<bool> callback)
         {
-            var timer = new System.Timers.Timer(interval.TotalMilliseconds);
-
-            timer.Elapsed += (sender, args) =>
+            GLib.Timeout.Add((uint)interval.TotalMilliseconds, () =>
             {
                 var result = callback();
-
-                if (!result)
-                {
-                    timer.Stop();
-                }
-            };
-
-            timer.Start();
+                return result;
+            });
         }
 
         private static int Hex(int v)

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs
@@ -72,10 +72,7 @@ private void UpdateText()
 
             if (formatted != null)
             {
-                Gtk.Application.Invoke(delegate
-                {
-                    Control.SetTextFromFormatted(formatted);
-                });
+                Control.SetTextFromFormatted(formatted);
             }
             else
             {
@@ -87,10 +84,7 @@ private void UpdateText()
                     Text = Element.Text
                 };
 
-                Gtk.Application.Invoke(delegate
-                {
-                    Control.SetTextFromSpan(span);
-                });
+                Control.SetTextFromSpan(span);
             }
         }