From b6704586875c6e8dbfe9fe142709a0404f20c582 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 26 Nov 2017 12:18:33 -0800
Subject: [PATCH 01/36] Fix Editor events

---
 Ooui.Forms/Renderers/EditorRenderer.cs | 18 +++++++++---------
 Ooui/TextArea.cs                       |  4 ++--
 Samples/XamlPreviewPage.xaml.cs        | 22 +++++++++++++++-------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Ooui.Forms/Renderers/EditorRenderer.cs b/Ooui.Forms/Renderers/EditorRenderer.cs
index 880c51e..a61a7e1 100644
--- a/Ooui.Forms/Renderers/EditorRenderer.cs
+++ b/Ooui.Forms/Renderers/EditorRenderer.cs
@@ -19,9 +19,9 @@ namespace Ooui.Forms.Renderers
 
             if (disposing) {
                 if (Control != null) {
-                    Control.Changed -= HandleChanged;
+                    Control.Inputted -= HandleChanged;
                     //Control.Started -= OnStarted;
-                    //Control.Ended -= OnEnded;
+                    Control.Changed -= OnEnded;
                 }
             }
 
@@ -40,9 +40,9 @@ namespace Ooui.Forms.Renderers
                     ClassName = "form-control"
                 });
 
-                Control.Changed += HandleChanged;
+                Control.Inputted += HandleChanged;
                 //Control.Started += OnStarted;
-                //Control.Ended += OnEnded;
+                Control.Changed += OnEnded;
             }
 
             UpdateText ();
@@ -75,13 +75,13 @@ namespace Ooui.Forms.Renderers
 
         void HandleChanged (object sender, EventArgs e)
         {
-            ElementController.SetValueFromRenderer (Editor.TextProperty, Control.Text);
+            ElementController.SetValueFromRenderer (Editor.TextProperty, Control.Value);
         }
 
         void OnEnded (object sender, EventArgs eventArgs)
         {
-            if (Control.Text != Element.Text)
-                ElementController.SetValueFromRenderer (Editor.TextProperty, Control.Text);
+            if (Control.Value != Element.Text)
+                ElementController.SetValueFromRenderer (Editor.TextProperty, Control.Value);
 
             Element.SetValue (VisualElement.IsFocusedPropertyKey, false);
             ElementController.SendCompleted ();
@@ -108,8 +108,8 @@ namespace Ooui.Forms.Renderers
 
         void UpdateText ()
         {
-            if (Control.Text != Element.Text)
-                Control.Text = Element.Text;
+            if (Control.Value != Element.Text)
+                Control.Value = Element.Text;
         }
 
         void UpdateTextAlignment ()
diff --git a/Ooui/TextArea.cs b/Ooui/TextArea.cs
index 94ca6fe..76b3a1d 100644
--- a/Ooui/TextArea.cs
+++ b/Ooui/TextArea.cs
@@ -42,12 +42,12 @@ namespace Ooui
         public TextArea (string text)
             : this ()
         {
-            Text = text;
+            Value = text;
         }
 
         protected override bool TriggerEventFromMessage (Message message)
         {
-            if (message.TargetId == Id && message.MessageType == MessageType.Event && message.Key == "change") {
+            if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
                 // Don't need to notify here because the base implementation will fire the event
                 val = message.Value != null ? Convert.ToString (message.Value) : "";
             }
diff --git a/Samples/XamlPreviewPage.xaml.cs b/Samples/XamlPreviewPage.xaml.cs
index 2a7ba12..08462bd 100644
--- a/Samples/XamlPreviewPage.xaml.cs
+++ b/Samples/XamlPreviewPage.xaml.cs
@@ -29,18 +29,26 @@ namespace Samples
   <Label Text=""Bottom Right"" Grid.Row=""1"" Grid.Column=""1"" />
 </Grid>
 </ContentView>";
+            editor.TextChanged += (sender, e) => DisplayXaml ();
             DisplayXaml ();
         }
 
         public void DisplayXaml ()
         {
-            var asm = typeof (Xamarin.Forms.Xaml.Internals.XamlTypeResolver).Assembly;
-            var xamlLoaderType = asm.GetType ("Xamarin.Forms.Xaml.XamlLoader");
-            var loadArgTypes = new[] { typeof (object), typeof (string) };
-            var loadMethod = xamlLoaderType.GetMethod ("Load", System.Reflection.BindingFlags.Static|System.Reflection.BindingFlags.Public, null, System.Reflection.CallingConventions.Any, loadArgTypes, null);
-            var contentView = new ContentView ();
-            loadMethod.Invoke (null, new object[] { contentView, editor.Text });
-            results.Content = contentView;
+            try {
+                var asm = typeof (Xamarin.Forms.Xaml.Internals.XamlTypeResolver).Assembly;
+                var xamlLoaderType = asm.GetType ("Xamarin.Forms.Xaml.XamlLoader");
+                var loadArgTypes = new[] { typeof (object), typeof (string) };
+                var loadMethod = xamlLoaderType.GetMethod ("Load", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public, null, System.Reflection.CallingConventions.Any, loadArgTypes, null);
+                var contentView = new ContentView ();
+                loadMethod.Invoke (null, new object[] { contentView, editor.Text });
+                results.Content = contentView;
+            }
+            catch (Exception ex) {
+                results.Content = new Label {
+                    Text = ex.ToString (),
+                };
+            }
         }
     }
 }

From 7756a9aaedda71640ae2977898fe8b308dbf714a Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Tue, 28 Nov 2017 19:01:48 -0800
Subject: [PATCH 02/36] Add version info to projects

---
 Ooui.AspNetCore/Ooui.AspNetCore.csproj | 8 ++++++++
 Ooui.Forms/Ooui.Forms.csproj           | 8 ++++++++
 Ooui/Ooui.csproj                       | 4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Ooui.AspNetCore/Ooui.AspNetCore.csproj b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
index bb62fe3..9fc7072 100644
--- a/Ooui.AspNetCore/Ooui.AspNetCore.csproj
+++ b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
@@ -1,6 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <Version>1.0.0</Version>
+    <Authors>praeclarum</Authors>
+    <Description>ASP.NET Core MVC extensions to make working with Ooui easy.</Description>
+    <PackageTags>UI;CrossPlatform</PackageTags>
+    <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/praeclarum/Ooui.git</RepositoryUrl>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/Ooui.Forms/Ooui.Forms.csproj b/Ooui.Forms/Ooui.Forms.csproj
index e081c10..8bcdc99 100644
--- a/Ooui.Forms/Ooui.Forms.csproj
+++ b/Ooui.Forms/Ooui.Forms.csproj
@@ -1,6 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <Version>1.0.0</Version>
+    <Authors>praeclarum</Authors>
+    <Description>Xamarin.Forms backend for the web using Ooui technologies.</Description>
+    <PackageTags>Ooui;UI;CrossPlatform;Xamarin.Forms</PackageTags>
+    <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/praeclarum/Ooui.git</RepositoryUrl>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
diff --git a/Ooui/Ooui.csproj b/Ooui/Ooui.csproj
index 3b692d5..98357fe 100644
--- a/Ooui/Ooui.csproj
+++ b/Ooui/Ooui.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>0.2.0</Version>
+    <Version>1.0.0</Version>
     <Authors>praeclarum</Authors>
     <Description>Small cross-platform UI library for .NET that uses web technologies.</Description>
-    <PackageTags>UI;CrossPlatform</PackageTags>
+    <PackageTags>Ooui;UI;CrossPlatform</PackageTags>
     <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>

From afff14139cac97399dc3a8ebef147461f2d81eb5 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Tue, 28 Nov 2017 19:52:24 -0800
Subject: [PATCH 03/36] Add links to new nugets

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 31e7782..7e75d75 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,12 @@
 # Ooui
 
-[![Build Status](https://www.bitrise.io/app/86585e168136767d/status.svg?token=G9Svvnv_NvG40gcqu48RNQ)](https://www.bitrise.io/app/86585e168136767d) [![NuGet Package](https://img.shields.io/nuget/v/Ooui.svg)](https://www.nuget.org/packages/Ooui)
+[![Build Status](https://www.bitrise.io/app/86585e168136767d/status.svg?token=G9Svvnv_NvG40gcqu48RNQ)](https://www.bitrise.io/app/86585e168136767d)
+
+| Version | Package | Description |
+| ------- | ------- | ----------- |
+| [![NuGet Package](https://img.shields.io/nuget/v/Ooui.svg)](https://www.nuget.org/packages/Ooui) | [Ooui](https://www.nuget.org/packages/Ooui) | Core library with HTML elements and a server. |
+| [![NuGet Package](https://img.shields.io/nuget/v/Ooui.Forms.svg)](https://www.nuget.org/packages/Ooui.Forms) | [Ooui.Forms](https://www.nuget.org/packages/Ooui.Forms) | Xamarin.Forms backend using Ooui |
+| [![NuGet Package](https://img.shields.io/nuget/v/Ooui.AspNetCore.svg)](https://www.nuget.org/packages/Ooui.AspNetCore) | [Ooui.AspNetCore](https://www.nuget.org/packages/Ooui.AspNetCore) | Integration with ASP.NET Core MVC |
 
 Ooui (pronounced *weeee!*) is a small cross-platform UI library for .NET that uses web technologies.
 

From 296a72ce48567a81a448e1379e213fd5fd3bcf4e Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Tue, 28 Nov 2017 20:26:09 -0800
Subject: [PATCH 04/36] Add ASP.NET tags

---
 Ooui.AspNetCore/Ooui.AspNetCore.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ooui.AspNetCore/Ooui.AspNetCore.csproj b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
index 9fc7072..786c6ac 100644
--- a/Ooui.AspNetCore/Ooui.AspNetCore.csproj
+++ b/Ooui.AspNetCore/Ooui.AspNetCore.csproj
@@ -4,7 +4,7 @@
     <Version>1.0.0</Version>
     <Authors>praeclarum</Authors>
     <Description>ASP.NET Core MVC extensions to make working with Ooui easy.</Description>
-    <PackageTags>UI;CrossPlatform</PackageTags>
+    <PackageTags>Ooui;UI;CrossPlatform;ASP.NET</PackageTags>
     <PackageIconUrl>https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/praeclarum/Ooui</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/praeclarum/Ooui/blob/master/LICENSE</PackageLicenseUrl>

From cfdad03e1cfee59d7b8bf087e8b6945378d10277 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 13:19:32 -0800
Subject: [PATCH 05/36] Add Option element and fix Select's Value

---
 Ooui/Node.cs   | 10 ++++++++++
 Ooui/Option.cs | 30 ++++++++++++++++++++++++++++++
 Ooui/Select.cs | 28 ++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 Ooui/Option.cs

diff --git a/Ooui/Node.cs b/Ooui/Node.cs
index 5a80ca1..2443a2b 100644
--- a/Ooui/Node.cs
+++ b/Ooui/Node.cs
@@ -74,6 +74,7 @@ namespace Ooui
             }
             newChild.MessageSent += HandleChildMessageSent;
             SendCall ("insertBefore", newChild, referenceChild);
+            OnChildInsertedBefore (newChild, referenceChild);
             return newChild;
         }
 
@@ -88,9 +89,18 @@ namespace Ooui
             }
             child.MessageSent -= HandleChildMessageSent;
             SendCall ("removeChild", child);
+            OnChildRemoved (child);
             return child;
         }
 
+        protected virtual void OnChildInsertedBefore (Node newChild, Node referenceChild)
+        {
+        }
+
+        protected virtual void OnChildRemoved (Node child)
+        {
+        }
+
         protected void ReplaceAll (Node newNode)
         {
             var toRemove = new List<Node> ();
diff --git a/Ooui/Option.cs b/Ooui/Option.cs
new file mode 100644
index 0000000..86d918e
--- /dev/null
+++ b/Ooui/Option.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Ooui
+{
+    public class Option : Element
+    {
+        string val = "";
+        public string Value {
+            get => val;
+            set => SetProperty (ref val, value ?? "", "value");
+        }
+
+        string label = "";
+        public string Label {
+            get => label;
+            set => SetProperty (ref label, value ?? "", "label");
+        }
+
+        bool defaultSelected = false;
+        public bool DefaultSelected {
+            get => defaultSelected;
+            set => SetProperty (ref defaultSelected, value, "defaultSelected");
+        }
+
+        public Option ()
+            : base ("option")
+        {
+        }
+    }
+}
diff --git a/Ooui/Select.cs b/Ooui/Select.cs
index 7f53175..30a7b64 100644
--- a/Ooui/Select.cs
+++ b/Ooui/Select.cs
@@ -15,9 +15,37 @@ namespace Ooui
             remove => RemoveEventListener ("change", value);
         }
 
+        public event TargetEventHandler Inputted {
+            add => AddEventListener ("input", value);
+            remove => RemoveEventListener ("input", value);
+        }
+
         public Select ()
             : base ("select")
         {
+            // Subscribe to the change event so we always get up-to-date values
+            Changed += (s, e) => { };
+        }
+
+        public void AddOption (string label, string value)
+        {
+            AppendChild (new Option { Label = label, Value = value });
+        }
+
+        protected override void OnChildInsertedBefore (Node newChild, Node referenceChild)
+        {
+            base.OnChildInsertedBefore (newChild, referenceChild);
+            if (string.IsNullOrEmpty (val) && newChild is Option o && !string.IsNullOrEmpty (o.Value)) {
+                val = o.Value;
+            }
+        }
+
+        protected override bool TriggerEventFromMessage (Message message)
+        {
+            if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
+                val = message.Value != null ? Convert.ToString (message.Value) : "";
+            }
+            return base.TriggerEventFromMessage (message);
         }
     }
 }

From e93d28957c8c217e0b4956eb9767452234f23a93 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 13:20:11 -0800
Subject: [PATCH 06/36] Add convenience ctors to Div

---
 Ooui/Div.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Ooui/Div.cs b/Ooui/Div.cs
index 02012c5..d4d8009 100644
--- a/Ooui/Div.cs
+++ b/Ooui/Div.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Ooui
 {
@@ -8,5 +9,21 @@ namespace Ooui
             : base ("div")
         {
         }
+
+        public Div (params Element[] children)
+            : this ()
+        {
+            foreach (var c in children) {
+                AppendChild (c);
+            }
+        }
+
+        public Div (IEnumerable<Element> children)
+            : this ()
+        {
+            foreach (var c in children) {
+                AppendChild (c);
+            }
+        }
     }
 }

From 1c21299dd3b957bcd256a601a0cd568198067807 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 13:20:33 -0800
Subject: [PATCH 07/36] Fix getting values from input events

---
 Ooui/Input.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ooui/Input.cs b/Ooui/Input.cs
index 9a2d2f2..1ceaa9d 100644
--- a/Ooui/Input.cs
+++ b/Ooui/Input.cs
@@ -88,7 +88,7 @@ namespace Ooui
 
         protected override bool TriggerEventFromMessage (Message message)
         {
-            if (message.TargetId == Id && message.MessageType == MessageType.Event && message.Key == "change") {
+            if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
                 // Don't need to notify here because the base implementation will fire the event
                 if (Type == InputType.Checkbox) {
                     isChecked = message.Value != null ? Convert.ToBoolean (message.Value) : false;

From 3c6f135761487373c26560eb4064808cae0f714c Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 13:20:55 -0800
Subject: [PATCH 08/36] Add ability to select which shape to draw

---
 Samples/DrawSample.cs | 12 +++++++++++-
 Samples/Program.cs    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Samples/DrawSample.cs b/Samples/DrawSample.cs
index 4adead0..2fe12b9 100644
--- a/Samples/DrawSample.cs
+++ b/Samples/DrawSample.cs
@@ -18,6 +18,9 @@ namespace Samples
         {
             var heading = new Heading ("Draw");
             var subtitle = new Paragraph ("Click to draw a masterpiece");
+            var toolSel = new Select ();
+            toolSel.AppendChild (new Option { Label = "Boxes", Value = "box" });
+            toolSel.AddOption ("Circles", "circle");
             var canvas = new Canvas {
                 Width = 320,
                 Height = 240,
@@ -25,8 +28,14 @@ namespace Samples
             var context = canvas.GetContext2D ();
 
             canvas.Clicked += (s, e) => {
+                var radius = 10;
                 context.BeginPath ();
-                context.Rect (e.OffsetX - 5, e.OffsetY - 5, 10, 10);
+                if (toolSel.Value == "box") {
+                    context.Rect (e.OffsetX - radius, e.OffsetY - radius, 2*radius, 2*radius);
+                }
+                else {
+                    context.Arc (e.OffsetX, e.OffsetY, radius, 0, 2 * Math.PI, true);
+                }
                 context.Fill ();
             };
             canvas.Style.Cursor = "pointer";
@@ -46,6 +55,7 @@ namespace Samples
             var app = new Div ();
             app.AppendChild (heading);
             app.AppendChild (subtitle);
+            app.AppendChild (new Div (toolSel));
             app.AppendChild (canvas);
             app.AppendChild (clearbtn);
             return app;
diff --git a/Samples/Program.cs b/Samples/Program.cs
index 7a3f706..e5ff7e5 100644
--- a/Samples/Program.cs
+++ b/Samples/Program.cs
@@ -32,7 +32,7 @@ namespace Samples
             new DisplayAlertSample ().Publish ();
             new EditorSample().Publish();
 
-            UI.Present ("/display-alert");
+            UI.Present ("/draw");
 
             Console.ReadLine ();
         }

From 503a5b2e4586790a282a8b7e93b8905b97fca9f1 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 14:43:48 -0800
Subject: [PATCH 09/36] Improve Forms text measuring

---
 Ooui.Forms/Extensions/FontExtensions.cs | 57 ++++++++++++++++++++++++-
 Samples/DisplayAlertPage.xaml           |  3 +-
 Samples/Program.cs                      |  2 +-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/Ooui.Forms/Extensions/FontExtensions.cs b/Ooui.Forms/Extensions/FontExtensions.cs
index 310ece6..8c53312 100644
--- a/Ooui.Forms/Extensions/FontExtensions.cs
+++ b/Ooui.Forms/Extensions/FontExtensions.cs
@@ -44,9 +44,23 @@ namespace Ooui.Forms.Extensions
                 return Size.Zero;
 
             var fontHeight = fontSize;
-            var charWidth = fontSize * 0.5;
 
-            var width = text.Length * charWidth;
+            var isBold = fontAttrs.HasFlag (FontAttributes.Bold);
+
+            var props = isBold ? BoldCharacterProportions : CharacterProportions;
+            var avgp = isBold ? BoldAverageCharProportion : AverageCharProportion;
+
+            var pwidth = 1.0e-6; // Tiny little padding to account for sampling errors
+            for (var i = 0; i < text.Length; i++) {
+                var c = (int)text[i];
+                if (c < 128) {
+                    pwidth += props[c];
+                }
+                else {
+                    pwidth += avgp;
+                }
+            }
+            var width = fontSize * pwidth;
 
             return new Size (width, fontHeight);
         }
@@ -69,5 +83,44 @@ namespace Ooui.Forms.Extensions
             }
         }
 
+        static readonly double[] CharacterProportions = {
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0.27799999713897705, 0.25899994373321533, 0.4259999990463257, 0.5560001134872437, 0.5560001134872437, 1.0000001192092896, 0.6299999952316284, 0.27799999713897705,
+            0.25899994373321533, 0.25899994373321533, 0.3520001173019409, 0.6000000238418579, 0.27799999713897705, 0.3890000581741333, 0.27799999713897705, 0.3330000638961792,
+            0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437,
+            0.5560001134872437, 0.5560001134872437, 0.27799999713897705, 0.27799999713897705, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.5560001134872437,
+            0.8000000715255737, 0.6480001211166382, 0.6850000619888306, 0.722000002861023, 0.7040001153945923, 0.6110001802444458, 0.5740000009536743, 0.7589999437332153,
+            0.722000002861023, 0.25899994373321533, 0.5190001726150513, 0.6669999361038208, 0.5560001134872437, 0.8709999322891235, 0.722000002861023, 0.7600001096725464,
+            0.6480001211166382, 0.7600001096725464, 0.6850000619888306, 0.6480001211166382, 0.5740000009536743, 0.722000002861023, 0.6110001802444458, 0.9259999990463257,
+            0.6110001802444458, 0.6480001211166382, 0.6110001802444458, 0.25899994373321533, 0.3330000638961792, 0.25899994373321533, 0.6000000238418579, 0.5000001192092896,
+            0.22200000286102295, 0.5370000600814819, 0.593000054359436, 0.5370000600814819, 0.593000054359436, 0.5370000600814819, 0.2960001230239868, 0.5740000009536743,
+            0.5560001134872437, 0.22200000286102295, 0.22200000286102295, 0.5190001726150513, 0.22200000286102295, 0.8530000448226929, 0.5560001134872437, 0.5740000009536743,
+            0.593000054359436, 0.593000054359436, 0.3330000638961792, 0.5000001192092896, 0.31500017642974854, 0.5560001134872437, 0.5000001192092896, 0.7580000162124634,
+            0.5180000066757202, 0.5000001192092896, 0.4800001382827759, 0.3330000638961792, 0.22200000286102295, 0.3330000638961792, 0.6000000238418579, 0
+        };
+        const double AverageCharProportion = 0.5131400561332703;
+
+        static readonly double[] BoldCharacterProportions = {
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0.27799999713897705, 0.27799999713897705, 0.46299993991851807, 0.5560001134872437, 0.5560001134872437, 1.0000001192092896, 0.6850000619888306, 0.27799999713897705,
+            0.2960001230239868, 0.2960001230239868, 0.40700018405914307, 0.6000000238418579, 0.27799999713897705, 0.40700018405914307, 0.27799999713897705, 0.37099993228912354,
+            0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437, 0.5560001134872437,
+            0.5560001134872437, 0.5560001134872437, 0.27799999713897705, 0.27799999713897705, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.5560001134872437,
+            0.8000000715255737, 0.6850000619888306, 0.7040001153945923, 0.7410000562667847, 0.7410000562667847, 0.6480001211166382, 0.593000054359436, 0.7589999437332153,
+            0.7410000562667847, 0.29499995708465576, 0.5560001134872437, 0.722000002861023, 0.593000054359436, 0.9070001840591431, 0.7410000562667847, 0.777999997138977,
+            0.6669999361038208, 0.777999997138977, 0.722000002861023, 0.6490000486373901, 0.6110001802444458, 0.7410000562667847, 0.6299999952316284, 0.9440001249313354,
+            0.6669999361038208, 0.6669999361038208, 0.6480001211166382, 0.3330000638961792, 0.37099993228912354, 0.3330000638961792, 0.6000000238418579, 0.5000001192092896,
+            0.25899994373321533, 0.5740000009536743, 0.6110001802444458, 0.5740000009536743, 0.6110001802444458, 0.5740000009536743, 0.3330000638961792, 0.6110001802444458,
+            0.593000054359436, 0.2580000162124634, 0.27799999713897705, 0.5740000009536743, 0.2580000162124634, 0.906000018119812, 0.593000054359436, 0.6110001802444458,
+            0.6110001802444458, 0.6110001802444458, 0.3890000581741333, 0.5370000600814819, 0.3520001173019409, 0.593000054359436, 0.5200001001358032, 0.8140000104904175,
+            0.5370000600814819, 0.5190001726150513, 0.5190001726150513, 0.3330000638961792, 0.223000168800354, 0.3330000638961792, 0.6000000238418579, 0
+        };
+        const double BoldAverageCharProportion = 0.5346300601959229;
     }
 }
diff --git a/Samples/DisplayAlertPage.xaml b/Samples/DisplayAlertPage.xaml
index fd29d53..ca53abc 100644
--- a/Samples/DisplayAlertPage.xaml
+++ b/Samples/DisplayAlertPage.xaml
@@ -4,7 +4,8 @@
              x:Class="Samples.DisplayAlertPage">
     <ContentPage.Content>
         <StackLayout>
-            <Label Text="Welcome to DisplayAlert Sample!" FontSize="32" FontAttributes="Bold" Margin="10,10,10,50" />
+            <Label Text="Welcome to DisplayAlert Sample!" FontSize="32" FontAttributes="Bold" Margin="10,10,10,50"
+                HorizontalOptions="Center"/>
             <ActivityIndicator x:Name="activity" />
             <ProgressBar x:Name="progress" />
             <DatePicker x:Name="datePicker" />
diff --git a/Samples/Program.cs b/Samples/Program.cs
index e5ff7e5..7a3f706 100644
--- a/Samples/Program.cs
+++ b/Samples/Program.cs
@@ -32,7 +32,7 @@ namespace Samples
             new DisplayAlertSample ().Publish ();
             new EditorSample().Publish();
 
-            UI.Present ("/draw");
+            UI.Present ("/display-alert");
 
             Console.ReadLine ();
         }

From b0311ec22df289417cc58908d182058b9a5857c0 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 14:46:14 -0800
Subject: [PATCH 10/36] Add page used to measure text

---
 Documentation/MeasureText.html | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 Documentation/MeasureText.html

diff --git a/Documentation/MeasureText.html b/Documentation/MeasureText.html
new file mode 100644
index 0000000..e645b1e
--- /dev/null
+++ b/Documentation/MeasureText.html
@@ -0,0 +1,56 @@
+<html>
+<body>
+
+<textarea id="result" cols="200" rows="32"></textarea>
+
+<canvas id="canvas" width="320" height="200"></canvas>
+
+
+
+<script>
+var canvas = document.getElementById('canvas');
+var ctx = canvas.getContext('2d');
+
+
+var r = "static readonly double[] CharacterProportions = {\n    ";
+var head = "";
+let size = 16;
+
+ctx.font = "bold " + size + "px \"Helvetica Neue\"";
+var mmm = ctx.measureText("MM");
+let sp = 0;
+let np = 0;
+let mw = 0;
+for (let i = 0; i < 128; i++) {
+    if (i > 0 && i % 8 == 0) {
+        head = ",\n    ";
+    }
+    else if (i > 0) {
+        head = ", ";
+    }
+    let c = String.fromCharCode(i);
+    let s = "M" + c + "M";
+    let m = ctx.measureText(s);
+    let w = m.width - mmm.width;
+    let p = w / size;
+    if (p > 1e-4) {
+        sp += p;
+        np++;
+    }
+    if (c == "M") {
+        mw = w;
+    }
+    r += head + p;
+    console.log (c + " = " + w);
+}
+
+let ap = sp / np;
+let padding = (mmm.width - mw*2)/size;
+r += "\n};\nconst double AverageCharProportion = " + ap + ";";
+r += "\nconst double StringWidthPaddingProportion = " + padding + ";";
+console.log(r);
+document.getElementById("result").innerText = r;
+</script>
+
+</body>
+</html>
\ No newline at end of file

From c1721e7727bd4ec64b764e1ecba2af4b107bbca3 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 15:34:48 -0800
Subject: [PATCH 11/36] Set window size for self-hosted apps

---
 Ooui.AspNetCore/WebSocketHandler.cs |  5 +++--
 Ooui/UI.cs                          | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Ooui.AspNetCore/WebSocketHandler.cs b/Ooui.AspNetCore/WebSocketHandler.cs
index ce6f417..a483e01 100644
--- a/Ooui.AspNetCore/WebSocketHandler.cs
+++ b/Ooui.AspNetCore/WebSocketHandler.cs
@@ -86,9 +86,10 @@ namespace Ooui.AspNetCore
                 BadRequest ("Missing `h`");
                 return;
             }
-            if (!double.TryParse (wValues.Last (), out var w))
+            var icult = System.Globalization.CultureInfo.InvariantCulture;
+            if (!double.TryParse (wValues.Last (), System.Globalization.NumberStyles.Any, icult, out var w))
                 w = 640;
-            if (!double.TryParse (hValues.Last (), out var h))
+            if (!double.TryParse (hValues.Last (), System.Globalization.NumberStyles.Any, icult, out var h))
                 h = 480;
 
             //
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index b3a3ac9..6b2faee 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -432,11 +432,32 @@ namespace Ooui
                 return;
             }
 
+            //
+            // Set the element's dimensions
+            //
+            var query =
+                (from part in listenerContext.Request.Url.Query.Split (new[] { '?', '&' })
+                 where part.Length > 0
+                 let kvs = part.Split ('=')
+                 where kvs.Length == 2
+                 select kvs).ToDictionary (x => Uri.UnescapeDataString (x[0]), x => Uri.UnescapeDataString (x[1]));
+            if (!query.TryGetValue ("w", out var wValue) || string.IsNullOrEmpty (wValue)) {
+                wValue = "640";
+            }
+            if (!query.TryGetValue ("h", out var hValue) || string.IsNullOrEmpty (hValue)) {
+                hValue = "480";
+            }
+            var icult = System.Globalization.CultureInfo.InvariantCulture;
+            if (!double.TryParse (wValue, System.Globalization.NumberStyles.Any, icult, out var w))
+                w = 640;
+            if (!double.TryParse (hValue, System.Globalization.NumberStyles.Any, icult, out var h))
+                h = 480;
+
             //
             // Create a new session and let it handle everything from here
             //
             try {
-                var session = new Session (webSocket, element, 1024, 768, serverToken);
+                var session = new Session (webSocket, element, w, h, serverToken);
                 await session.RunAsync ().ConfigureAwait (false);
             }
             catch (WebSocketException ex) when (ex.WebSocketErrorCode == WebSocketError.ConnectionClosedPrematurely) {

From 877a835367bf4a1f5f3efcbae9f809febd288fd4 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 15:50:59 -0800
Subject: [PATCH 12/36] Update the service to always restart

---
 ooui.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooui.service b/ooui.service
index b63bdad..c92b8a8 100644
--- a/ooui.service
+++ b/ooui.service
@@ -7,7 +7,7 @@ Type=simple
 Environment=HOME=/home/ubuntu
 WorkingDirectory=/home/ubuntu/Ooui/PlatformSamples/AspNetCoreMvc
 ExecStart=/usr/bin/dotnet run --no-build --server.urls=http://0.0.0.0:80/
-Restart=on-abort
+Restart=always
 
 [Install]
 WantedBy=multi-user.target

From a96c3977f659172692f03edd281810b80c825abd Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 17:02:04 -0800
Subject: [PATCH 13/36] Add an Etag to client.js

---
 Ooui.AspNetCore/OouiMiddlewareExtensions.cs | 19 ++++++---
 Ooui/UI.cs                                  | 43 ++++++++++++++++++---
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Ooui.AspNetCore/OouiMiddlewareExtensions.cs b/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
index deaa51e..0d78459 100644
--- a/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
+++ b/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
@@ -30,12 +30,19 @@ namespace Microsoft.AspNetCore.Builder
                 if (context.Request.Path == jsPath) {
                     var response = context.Response;
                     var clientJsBytes = Ooui.UI.ClientJsBytes;
-                    response.StatusCode = 200;
-                    response.ContentLength = clientJsBytes.Length;
-                    response.ContentType = "application/javascript; charset=utf-8";
-                    response.Headers.Add ("Cache-Control", "public, max-age=3600");
-                    using (var s = response.Body) {
-                        await s.WriteAsync (clientJsBytes, 0, clientJsBytes.Length).ConfigureAwait (false);
+                    var clientJsEtag = Ooui.UI.ClientJsEtag;
+                    if (context.Request.Headers.TryGetValue ("If-None-Match", out var inms) && inms.Count > 0 && inms[0] == clientJsEtag) {
+                        response.StatusCode = 304;
+                    }
+                    else {
+                        response.StatusCode = 200;
+                        response.ContentLength = clientJsBytes.Length;
+                        response.ContentType = "application/javascript; charset=utf-8";
+                        response.Headers.Add ("Cache-Control", "public, max-age=60");
+                        response.Headers.Add ("Etag", clientJsEtag);
+                        using (var s = response.Body) {
+                            await s.WriteAsync (clientJsBytes, 0, clientJsBytes.Length).ConfigureAwait (false);
+                        }
                     }
                 }
                 else if (context.Request.Path == WebSocketHandler.WebSocketPath) {
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index 6b2faee..c8e0dd7 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -14,6 +14,9 @@ namespace Ooui
     {
         static readonly ManualResetEvent started = new ManualResetEvent (false);
 
+        [ThreadStatic]
+        static System.Security.Cryptography.SHA256 sha256;
+
         static CancellationTokenSource serverCts;
 
         static readonly Dictionary<string, RequestHandler> publishedPaths =
@@ -26,8 +29,10 @@ namespace Ooui
         public static StyleSelectors Styles => rules;
 
         static readonly byte[] clientJsBytes;
+        static readonly string clientJsEtag;
 
         public static byte[] ClientJsBytes => clientJsBytes;
+        public static string ClientJsEtag => clientJsEtag;
 
         public static string Template { get; set; } = $@"<!DOCTYPE html>
 <html>
@@ -79,6 +84,22 @@ namespace Ooui
                     clientJsBytes = Encoding.UTF8.GetBytes (r.ReadToEnd ());
                 }
             }
+            clientJsEtag = "\"" + Hash (clientJsBytes) + "\"";
+        }
+
+        static string Hash (byte[] bytes)
+        {
+            var sha = sha256;
+            if (sha == null) {
+                sha = System.Security.Cryptography.SHA256.Create ();
+                sha256 = sha;
+            }
+            var data = sha.ComputeHash (bytes);
+            StringBuilder sBuilder = new StringBuilder ();
+            for (int i = 0; i < data.Length; i++) {
+                sBuilder.Append (data[i].ToString ("x2"));
+            }
+            return sBuilder.ToString ();
         }
 
         static void Publish (string path, RequestHandler handler)
@@ -232,12 +253,22 @@ namespace Ooui
             var response = listenerContext.Response;
 
             if (path == "/ooui.js") {
-                response.ContentLength64 = clientJsBytes.LongLength;
-                response.ContentType = "application/javascript";
-                response.ContentEncoding = Encoding.UTF8;
-                response.AddHeader ("Cache-Control", "public, max-age=3600");
-                using (var s = response.OutputStream) {
-                    s.Write (clientJsBytes, 0, clientJsBytes.Length);
+                var inm = listenerContext.Request.Headers.Get ("If-None-Match");
+                if (string.IsNullOrEmpty (inm) || inm != clientJsEtag) {
+                    response.StatusCode = 200;
+                    response.ContentLength64 = clientJsBytes.LongLength;
+                    response.ContentType = "application/javascript";
+                    response.ContentEncoding = Encoding.UTF8;
+                    response.AddHeader ("Cache-Control", "public, max-age=60");
+                    response.AddHeader ("Etag", clientJsEtag);
+                    using (var s = response.OutputStream) {
+                        s.Write (clientJsBytes, 0, clientJsBytes.Length);
+                    }
+                    response.Close ();
+                }
+                else {
+                    response.StatusCode = 304;
+                    response.Close ();
                 }
             }
             else {

From 9b09f6992e34997720061669a5dbe183b885e405 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 17:49:11 -0800
Subject: [PATCH 14/36] Fix transmit queue synchronization bug

---
 Ooui/Client.js |  2 +-
 Ooui/UI.cs     | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Ooui/Client.js b/Ooui/Client.js
index e796069..4709ced 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -1,5 +1,5 @@
 
-var debug = false;
+var debug = true;
 
 const nodes = {};
 
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index c8e0dd7..768d992 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -671,6 +671,7 @@ namespace Ooui
                 //
                 // Add it to the queue
                 //
+                //Console.WriteLine ($"QM {message.MessageType} {message.TargetId} {message.Key} {message.Value}");
                 queuedMessages.Add (message);
             }
 
@@ -689,19 +690,24 @@ namespace Ooui
                     // Dequeue as many messages as we can
                     //
                     var messagesToSend = new List<Message> ();
+                    System.Runtime.CompilerServices.ConfiguredTaskAwaitable task;
                     lock (queuedMessages) {
                         messagesToSend.AddRange (queuedMessages);
                         queuedMessages.Clear ();
-                    }
-                    if (messagesToSend.Count == 0)
-                        return;
 
-                    //
-                    // Now actually send this message
-                    //
-                    var json = Newtonsoft.Json.JsonConvert.SerializeObject (messagesToSend);
-                    var outputBuffer = new ArraySegment<byte> (Encoding.UTF8.GetBytes (json));
-                    await webSocket.SendAsync (outputBuffer, WebSocketMessageType.Text, true, token).ConfigureAwait (false);
+                        if (messagesToSend.Count == 0)
+                            return;
+
+                        //
+                        // Now actually send this message
+                        // Do this while locked to make sure SendAsync is called in the right order
+                        //
+                        var json = Newtonsoft.Json.JsonConvert.SerializeObject (messagesToSend);
+                        var outputBuffer = new ArraySegment<byte> (Encoding.UTF8.GetBytes (json));
+                        //Console.WriteLine ("TRANSMIT " + json);
+                        task = webSocket.SendAsync (outputBuffer, WebSocketMessageType.Text, true, token).ConfigureAwait (false);
+                    }
+                    await task;
                 }
                 catch (Exception ex) {                        
                     Error ("Failed to send queued messages, aborting session", ex);

From 0ecc2d19b52318d2cb3c21f67204f3abd5b97767 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 18:03:49 -0800
Subject: [PATCH 15/36] Update Title

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7e75d75..8c5d907 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# Ooui
-
-[![Build Status](https://www.bitrise.io/app/86585e168136767d/status.svg?token=G9Svvnv_NvG40gcqu48RNQ)](https://www.bitrise.io/app/86585e168136767d)
+# Ooui Web Framework <img src="https://github.com/praeclarum/Ooui/raw/master/Documentation/Icon.png" height="32"> [![Build Status](https://www.bitrise.io/app/86585e168136767d/status.svg?token=G9Svvnv_NvG40gcqu48RNQ)](https://www.bitrise.io/app/86585e168136767d)
 
 | Version | Package | Description |
 | ------- | ------- | ----------- |

From d0734ae79591ff2624296d9feca27aef5f82673f Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 19:18:34 -0800
Subject: [PATCH 16/36] Add BugSweeper sample

---
 Ooui/Client.js                            |   2 +-
 Samples/BugSweeper/App.cs                 |  13 ++
 Samples/BugSweeper/Board.cs               | 235 ++++++++++++++++++++++
 Samples/BugSweeper/BugSweeperPage.xaml    |  78 +++++++
 Samples/BugSweeper/BugSweeperPage.xaml.cs | 174 ++++++++++++++++
 Samples/BugSweeper/Images/RedBug.png      | Bin 0 -> 12103 bytes
 Samples/BugSweeper/Images/Xamarin120.png  | Bin 0 -> 7181 bytes
 Samples/BugSweeper/Tile.cs                | 191 ++++++++++++++++++
 Samples/BugSweeperSample.cs               |  16 ++
 Samples/Samples.csproj                    |   6 +
 10 files changed, 714 insertions(+), 1 deletion(-)
 create mode 100755 Samples/BugSweeper/App.cs
 create mode 100755 Samples/BugSweeper/Board.cs
 create mode 100644 Samples/BugSweeper/BugSweeperPage.xaml
 create mode 100755 Samples/BugSweeper/BugSweeperPage.xaml.cs
 create mode 100755 Samples/BugSweeper/Images/RedBug.png
 create mode 100755 Samples/BugSweeper/Images/Xamarin120.png
 create mode 100755 Samples/BugSweeper/Tile.cs
 create mode 100644 Samples/BugSweeperSample.cs

diff --git a/Ooui/Client.js b/Ooui/Client.js
index 4709ced..e796069 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -1,5 +1,5 @@
 
-var debug = true;
+var debug = false;
 
 const nodes = {};
 
diff --git a/Samples/BugSweeper/App.cs b/Samples/BugSweeper/App.cs
new file mode 100755
index 0000000..bc51379
--- /dev/null
+++ b/Samples/BugSweeper/App.cs
@@ -0,0 +1,13 @@
+using System;
+using Xamarin.Forms;
+
+namespace BugSweeper
+{
+	public class App : Application
+    {
+		public App ()
+        {
+            MainPage = new BugSweeperPage();
+        }
+    }
+}
diff --git a/Samples/BugSweeper/Board.cs b/Samples/BugSweeper/Board.cs
new file mode 100755
index 0000000..33b3950
--- /dev/null
+++ b/Samples/BugSweeper/Board.cs
@@ -0,0 +1,235 @@
+using System;
+using Xamarin.Forms;
+
+namespace BugSweeper
+{
+    class Board : AbsoluteLayout
+    {
+        // Alternative sizes make the tiles a tad small.
+        const int COLS = 9;         // 16
+        const int ROWS = 9;         // 16
+        const int BUGS = 10;        // 40
+
+        Tile[,] tiles = new Tile[ROWS, COLS];
+        int flaggedTileCount;
+        bool isGameInProgress;              // on first tap
+        bool isGameInitialized;             // on first double-tap
+        bool isGameEnded;
+
+        // Events to notify page.
+        public event EventHandler GameStarted;
+        public event EventHandler<bool> GameEnded;
+
+        public Board()
+        {
+            for (int row = 0; row < ROWS; row++)
+                for (int col = 0; col < COLS; col++)
+                {
+                    Tile tile = new Tile(row, col);
+                    tile.TileStatusChanged += OnTileStatusChanged;
+                    this.Children.Add(tile);
+                    tiles[row, col] = tile;
+                }
+
+            SizeChanged += (sender, args) =>
+                {
+                    double tileWidth = this.Width / COLS;
+                    double tileHeight = this.Height / ROWS;
+
+                    foreach (Tile tile in tiles)
+                    {
+                        Rectangle bounds = new Rectangle(tile.Col * tileWidth,
+                                                         tile.Row * tileHeight,
+                                                         tileWidth, tileHeight);
+                        AbsoluteLayout.SetLayoutBounds(tile, bounds);
+                    }
+                };
+
+            NewGameInitialize();
+        }
+
+        public void NewGameInitialize()
+        {
+            // Clear all the tiles.
+            foreach (Tile tile in tiles)
+                tile.Initialize();
+
+            isGameInProgress = false;
+            isGameInitialized = false;
+            isGameEnded = false;
+            this.FlaggedTileCount = 0;
+        }
+
+        public int FlaggedTileCount
+        {
+            set
+            {
+                if (flaggedTileCount != value)
+                {
+                    flaggedTileCount = value;
+                    OnPropertyChanged();
+                }
+            }
+            get
+            {
+                return flaggedTileCount;
+            }
+        }
+
+        public int BugCount
+        {
+            get
+            {
+                return BUGS;
+            }
+        }
+
+        
+        // Not called until the first tile is double-tapped.
+        void DefineNewBoard(int tappedRow, int tappedCol)
+        {
+            // Begin the assignment of bugs.
+            Random random = new Random();
+            int bugCount = 0;
+
+            while (bugCount < BUGS)
+            {
+                // Get random row and column.
+                int row = random.Next(ROWS);
+                int col = random.Next(COLS);
+
+                // Skip it if it's already a bug.
+                if (tiles[row, col].IsBug)
+                {
+                    continue;
+                }
+
+                // Avoid the tappedRow & Col & surrounding ones.
+                if (row >= tappedRow - 1 &&
+                    row <= tappedRow + 1 &&
+                    col >= tappedCol - 1 &&
+                    col <= tappedCol + 1)
+                {
+                    continue;
+                }
+
+                // It's a bug!
+                tiles[row, col].IsBug = true;
+
+                // Calculate the surrounding bug count.
+                CycleThroughNeighbors(row, col,
+                    (neighborRow, neighborCol) =>
+                    {
+                        ++tiles[neighborRow, neighborCol].SurroundingBugCount;
+                    });
+
+                bugCount++;
+            }
+        }
+
+        void CycleThroughNeighbors(int row, int col, Action<int, int> callback)
+        {
+            int minRow = Math.Max(0, row - 1);
+            int maxRow = Math.Min(ROWS - 1, row + 1);
+            int minCol = Math.Max(0, col - 1);
+            int maxCol = Math.Min(COLS - 1, col + 1);
+
+            for (int neighborRow = minRow; neighborRow <= maxRow; neighborRow++)
+                for (int neighborCol = minCol; neighborCol <= maxCol; neighborCol++)
+                {
+                    if (neighborRow != row || neighborCol != col)
+                        callback(neighborRow, neighborCol);
+                }
+        }
+
+        void OnTileStatusChanged(object sender, TileStatus tileStatus)
+        {
+            if (isGameEnded)
+                return;
+
+            // With a first tile tapped, the game is now in progress.
+            if (!isGameInProgress)
+            {
+                isGameInProgress = true;
+
+                // Fire the GameStarted event.
+                if (GameStarted != null)
+                {
+                    GameStarted(this, EventArgs.Empty);
+                }
+            }
+
+            // Update the "flagged" bug count before checking for a loss.
+            int flaggedCount = 0;
+
+            foreach (Tile tile in tiles)
+                if (tile.Status == TileStatus.Flagged)
+                    flaggedCount++;
+
+            this.FlaggedTileCount = flaggedCount;
+
+            // Get the tile whose status has changed.
+            Tile changedTile = (Tile)sender;
+
+            // If it's exposed, some actions are required.
+            if (tileStatus == TileStatus.Exposed)
+            {
+                if (!isGameInitialized)
+                {
+                    DefineNewBoard(changedTile.Row, changedTile.Col);
+                    isGameInitialized = true;
+                }
+
+                if (changedTile.IsBug)
+                {
+                    isGameInProgress = false;
+                    isGameEnded = true;
+
+                    // Fire the GameEnded event!
+                    if (GameEnded != null)
+                    {
+                        GameEnded(this, false);
+                    }
+                    return;
+                }
+
+                // Auto expose for zero surrounding bugs.
+                if (changedTile.SurroundingBugCount == 0)
+                {
+                    CycleThroughNeighbors(changedTile.Row, changedTile.Col,
+                        (neighborRow, neighborCol) =>
+                        {
+                            // Expose all the neighbors.
+                            tiles[neighborRow, neighborCol].Status = TileStatus.Exposed;
+                        });
+                }
+            }
+
+            // Check for a win.
+            bool hasWon = true;
+
+            foreach (Tile til in tiles)
+            {
+                if (til.IsBug && til.Status != TileStatus.Flagged)
+                    hasWon = false;
+
+                if (!til.IsBug && til.Status != TileStatus.Exposed)
+                    hasWon = false;
+            }
+
+            // If there's a win, celebrate!
+            if (hasWon)
+            {
+                isGameInProgress = false;
+                isGameEnded = true;
+
+                // Fire the GameEnded event!
+                if (GameEnded != null)
+                {
+                    GameEnded(this, true);
+                }
+                return;
+            }
+        }
+    }
+}
diff --git a/Samples/BugSweeper/BugSweeperPage.xaml b/Samples/BugSweeper/BugSweeperPage.xaml
new file mode 100644
index 0000000..64b74c6
--- /dev/null
+++ b/Samples/BugSweeper/BugSweeperPage.xaml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+             xmlns:local="clr-namespace:BugSweeper" 
+             x:Class="BugSweeper.BugSweeperPage" 
+             Title="BugSweeper">
+    <ContentPage.Padding>
+        <OnPlatform x:TypeArguments="Thickness" iOS="0, 20, 0, 0" Android="0, 0, 0, 0" WinPhone="0, 0, 0, 0" />
+    </ContentPage.Padding>
+    <ContentView SizeChanged="OnMainContentViewSizeChanged">
+        <Grid x:Name="mainGrid" ColumnSpacing="0" RowSpacing="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="7*" />
+                <RowDefinition Height="4*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <StackLayout x:Name="textStack" Grid.Row="0" Grid.Column="1" Spacing="0">
+                <StackLayout HorizontalOptions="Center" Spacing="0">
+                    <Label Text="BugSweeper" Font="Bold, Large" TextColor="Accent" />
+                    <BoxView Color="Accent" HeightRequest="3" />
+                </StackLayout>
+                <Label Text="Tap to flag/unflag a potential bug." VerticalOptions="CenterAndExpand" HorizontalTextAlignment="Center" />
+                <Label Text="Double-tap if you're sure it's not a bug.&#xA;The first double-tap is always safe!" VerticalOptions="CenterAndExpand" HorizontalTextAlignment="Center" />
+                <StackLayout Orientation="Horizontal" Spacing="0" VerticalOptions="CenterAndExpand" HorizontalOptions="Center">
+                    <Label BindingContext="{x:Reference board}" Text="{Binding FlaggedTileCount, StringFormat='Flagged {0} '}" />
+                    <Label BindingContext="{x:Reference board}" Text="{Binding BugCount, StringFormat=' out of {0} bugs.'}" />
+                </StackLayout>
+                <!-- Make this a binding??? -->
+                <Label x:Name="timeLabel" Text="0:00" VerticalOptions="CenterAndExpand" HorizontalTextAlignment="Center" />
+            </StackLayout>
+            <ContentView Grid.Row="1" Grid.Column="1" SizeChanged="OnBoardContentViewSizeChanged">
+                <!-- Single-cell Grid for Board and overlays. -->
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <local:Board x:Name="board" />
+                    <StackLayout x:Name="congratulationsText" Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center" Spacing="0">
+                        <Label Text="C" TextColor="Red" />
+                        <Label Text="O" TextColor="Red" />
+                        <Label Text="N" TextColor="Red" />
+                        <Label Text="G" TextColor="Red" />
+                        <Label Text="R" TextColor="Red" />
+                        <Label Text="A" TextColor="Red" />
+                        <Label Text="T" TextColor="Red" />
+                        <Label Text="U" TextColor="Red" />
+                        <Label Text="L" TextColor="Red" />
+                        <Label Text="A" TextColor="Red" />
+                        <Label Text="T" TextColor="Red" />
+                        <Label Text="I" TextColor="Red" />
+                        <Label Text="O" TextColor="Red" />
+                        <Label Text="N" TextColor="Red" />
+                        <Label Text="S" TextColor="Red" />
+                        <Label Text="!" TextColor="Red" />
+                    </StackLayout>
+                    <StackLayout x:Name="consolationText" Orientation="Horizontal" Spacing="0" HorizontalOptions="Center" VerticalOptions="Center">
+                        <Label Text="T" TextColor="Red" />
+                        <Label Text="O" TextColor="Red" />
+                        <Label Text="O" TextColor="Red" />
+                        <Label Text=" " TextColor="Red" />
+                        <Label Text="B" TextColor="Red" />
+                        <Label Text="A" TextColor="Red" />
+                        <Label Text="D" TextColor="Red" />
+                        <Label Text="!" TextColor="Red" />
+                    </StackLayout>
+                    <Button x:Name="playAgainButton" Text=" Play Another Game? " HorizontalOptions="Center" VerticalOptions="Center" Clicked="OnplayAgainButtonClicked"
+                            BorderColor="Black" BorderWidth="2" BackgroundColor="White" TextColor="Black" />
+                </Grid>
+            </ContentView>
+        </Grid>
+    </ContentView>
+</ContentPage>
\ No newline at end of file
diff --git a/Samples/BugSweeper/BugSweeperPage.xaml.cs b/Samples/BugSweeper/BugSweeperPage.xaml.cs
new file mode 100755
index 0000000..527abe5
--- /dev/null
+++ b/Samples/BugSweeper/BugSweeperPage.xaml.cs
@@ -0,0 +1,174 @@
+#define FIX_WINPHONE_BUTTON         // IsEnabled = false doesn't disable button
+
+#pragma warning disable 4014        // for non-await'ed async call
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BugSweeper
+{
+    public partial class BugSweeperPage : ContentPage
+    {
+        const string timeFormat = @"%m\:ss";
+
+        bool isGameInProgress;
+        DateTime gameStartTime;
+
+        public BugSweeperPage()
+        {
+            InitializeComponent();
+
+            board.GameStarted += (sender, args) =>
+                {
+                    isGameInProgress = true;
+                    gameStartTime = DateTime.Now;
+
+                    Device.StartTimer(TimeSpan.FromSeconds(1), () =>
+                    {
+                        timeLabel.Text = (DateTime.Now - gameStartTime).ToString(timeFormat);
+                        return isGameInProgress;
+                    });
+                };
+
+            board.GameEnded += (sender, hasWon) =>
+                {
+                    isGameInProgress = false;
+
+                    if (hasWon)
+                    {
+                        DisplayWonAnimation();
+                    }
+                    else
+                    {
+                        DisplayLostAnimation();
+                    }
+                };
+
+            PrepareForNewGame();
+        }
+
+        void PrepareForNewGame()
+        {
+            board.NewGameInitialize();
+
+            congratulationsText.IsVisible = false;
+            consolationText.IsVisible = false;
+            playAgainButton.IsVisible = false;
+            playAgainButton.IsEnabled = false;
+
+            timeLabel.Text = new TimeSpan().ToString(timeFormat);
+            isGameInProgress = false;
+        }
+
+        void OnMainContentViewSizeChanged(object sender, EventArgs args)
+        {
+            ContentView contentView = (ContentView)sender;
+            double width = contentView.Width;
+            double height = contentView.Height;
+
+            bool isLandscape = width > height;
+
+            if (isLandscape)
+            {
+                mainGrid.RowDefinitions[0].Height = 0;
+                mainGrid.RowDefinitions[1].Height = new GridLength(1, GridUnitType.Star);
+
+                mainGrid.ColumnDefinitions[0].Width = new GridLength(1, GridUnitType.Star);
+                mainGrid.ColumnDefinitions[1].Width = new GridLength(1, GridUnitType.Star);
+
+                Grid.SetRow(textStack, 1);
+                Grid.SetColumn(textStack, 0);
+            }
+            else // portrait
+            {
+                mainGrid.RowDefinitions[0].Height = new GridLength(3, GridUnitType.Star);
+                mainGrid.RowDefinitions[1].Height = new GridLength(5, GridUnitType.Star);
+
+                mainGrid.ColumnDefinitions[0].Width = 0;
+                mainGrid.ColumnDefinitions[1].Width = new GridLength(1, GridUnitType.Star);
+
+                Grid.SetRow(textStack, 0);
+                Grid.SetColumn(textStack, 1);
+            }
+        }
+
+        // Maintains a square aspect ratio for the board.
+        void OnBoardContentViewSizeChanged(object sender, EventArgs args)
+        {
+            ContentView contentView = (ContentView)sender;
+            double width = contentView.Width;
+            double height = contentView.Height;
+            double dimension = Math.Min(width, height);
+            double horzPadding = (width - dimension) / 2;
+            double vertPadding = (height - dimension) / 2;
+            contentView.Padding = new Thickness(horzPadding, vertPadding);
+        }
+
+        async void DisplayWonAnimation()
+        {
+            congratulationsText.Scale = 0;
+            congratulationsText.IsVisible = true;
+
+            // Because IsVisible has been false, the text might not have a size yet, 
+            //  in which case Measure will return a size.
+            double congratulationsTextWidth = congratulationsText.Measure(Double.PositiveInfinity, Double.PositiveInfinity).Request.Width;
+
+            congratulationsText.Rotation = 0;
+            congratulationsText.RotateTo(3 * 360, 1000, Easing.CubicOut);
+
+            double maxScale = 0.9 * board.Width / congratulationsTextWidth;
+            await congratulationsText.ScaleTo(maxScale, 1000);
+
+            foreach (View view in congratulationsText.Children)
+            {
+                view.Rotation = 0;
+                view.RotateTo(180);
+                await view.ScaleTo(3, 100);
+                view.RotateTo(360);
+                await view.ScaleTo(1, 100);
+            }
+
+            await DisplayPlayAgainButton();
+        }
+
+        async void DisplayLostAnimation()
+        {
+            consolationText.Scale = 0;
+            consolationText.IsVisible = true;
+
+            // (See above for rationale)
+            double consolationTextWidth = consolationText.Measure(Double.PositiveInfinity, Double.PositiveInfinity).Request.Width;
+
+            double maxScale = 0.9 * board.Width / consolationTextWidth;
+            await consolationText.ScaleTo(maxScale, 1000);
+            await Task.Delay(1000);
+            await DisplayPlayAgainButton();
+        }
+
+        async Task DisplayPlayAgainButton()
+        {
+            playAgainButton.Scale = 0;
+            playAgainButton.IsVisible = true;
+            playAgainButton.IsEnabled = true;
+
+            // (See above for rationale)
+            double playAgainButtonWidth = playAgainButton.Measure(Double.PositiveInfinity, Double.PositiveInfinity).Request.Width;
+
+            double maxScale = board.Width / playAgainButtonWidth;
+            await playAgainButton.ScaleTo(maxScale, 1000, Easing.SpringOut);
+        }
+
+        void OnplayAgainButtonClicked(object sender, object EventArgs)
+        {
+#if FIX_WINPHONE_BUTTON
+
+            if (Device.OS == TargetPlatform.WinPhone && !((Button)sender).IsEnabled)
+                return;
+
+#endif
+            PrepareForNewGame();
+        }
+    }
+}
diff --git a/Samples/BugSweeper/Images/RedBug.png b/Samples/BugSweeper/Images/RedBug.png
new file mode 100755
index 0000000000000000000000000000000000000000..e61ca5fdf5afb7918bcf942bad77890a0a7492ef
GIT binary patch
literal 12103
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

literal 0
HcmV?d00001

diff --git a/Samples/BugSweeper/Images/Xamarin120.png b/Samples/BugSweeper/Images/Xamarin120.png
new file mode 100755
index 0000000000000000000000000000000000000000..32918a4955e3e52f56b28568039e01e533e3257e
GIT binary patch
literal 7181
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
P00000NkvXXu0mjfgK`V|

literal 0
HcmV?d00001

diff --git a/Samples/BugSweeper/Tile.cs b/Samples/BugSweeper/Tile.cs
new file mode 100755
index 0000000..b21e39c
--- /dev/null
+++ b/Samples/BugSweeper/Tile.cs
@@ -0,0 +1,191 @@
+#define FIX_WINDOWS_DOUBLE_TAPS         // Double-taps don't work well on Windows Runtime as of 2.3.0
+#define FIX_WINDOWS_PHONE_NULL_CONTENT  // Set Content of Frame to null doesn't work in Windows as of 2.3.0
+
+using System;
+using Xamarin.Forms;
+
+namespace BugSweeper
+{
+    enum TileStatus
+    {
+        Hidden,
+        Flagged,
+        Exposed
+    }
+
+    class Tile : Frame
+    {
+        TileStatus tileStatus = TileStatus.Hidden;
+        Label label;
+        Image flagImage, bugImage;
+        static ImageSource flagImageSource;
+        static ImageSource bugImageSource;
+        bool doNotFireEvent;
+
+        public event EventHandler<TileStatus> TileStatusChanged;
+
+        static Tile()
+        {
+            flagImageSource = ImageSource.FromResource("Samples.BugSweeper.Images.Xamarin120.png", System.Reflection.Assembly.GetCallingAssembly());
+            bugImageSource = ImageSource.FromResource("Samples.BugSweeper.Images.RedBug.png", System.Reflection.Assembly.GetCallingAssembly ());
+        }
+
+        public Tile(int row, int col)
+        {
+            this.Row = row;
+            this.Col = col;
+
+            this.BackgroundColor = Color.Yellow;
+            this.OutlineColor = Color.Blue;
+            this.Padding = 2;
+
+            label = new Label {
+                Text = " ",
+                TextColor = Color.Yellow,
+                BackgroundColor = Color.Blue,
+                HorizontalTextAlignment = TextAlignment.Center,
+                VerticalTextAlignment = TextAlignment.Center,
+            };
+
+            flagImage = new Image {
+                Source = flagImageSource,
+
+            };
+
+            bugImage = new Image {
+                Source = bugImageSource
+            };
+
+            TapGestureRecognizer singleTap = new TapGestureRecognizer {
+                NumberOfTapsRequired = 1
+            };
+            singleTap.Tapped += OnSingleTap;
+            this.GestureRecognizers.Add(singleTap);
+
+#if FIX_WINDOWS_DOUBLE_TAPS
+
+            if (Device.OS != TargetPlatform.Windows && Device.OS != TargetPlatform.WinPhone) {
+
+#endif
+
+                TapGestureRecognizer doubleTap = new TapGestureRecognizer {
+                    NumberOfTapsRequired = 2
+                };
+                doubleTap.Tapped += OnDoubleTap;
+                this.GestureRecognizers.Add(doubleTap);
+
+#if FIX_WINDOWS_DOUBLE_TAPS
+
+            }
+
+#endif
+
+        }
+
+        public int Row { private set; get; }
+
+        public int Col { private set; get; }
+
+        public bool IsBug { set; get; }
+
+        public int SurroundingBugCount { set; get; }
+
+        public TileStatus Status {
+            set {
+                if (tileStatus != value) {
+                    tileStatus = value;
+
+                    switch (tileStatus) {
+                        case TileStatus.Hidden:
+                            this.Content = null;
+
+#if FIX_WINDOWS_PHONE_NULL_CONTENT
+
+                            if (Device.OS == TargetPlatform.WinPhone || Device.OS == TargetPlatform.Windows) {
+                                this.Content = new Label { Text = " " };
+                            }
+
+#endif
+                            break;
+
+                        case TileStatus.Flagged:
+                            this.Content = flagImage;
+                            break;
+
+                        case TileStatus.Exposed:
+                            if (this.IsBug) {
+                                this.Content = bugImage;
+                            } else {
+                                this.Content = label;
+                                label.Text =
+                                        (this.SurroundingBugCount > 0) ?
+                                            this.SurroundingBugCount.ToString() : " ";
+                            }
+                            break;
+                    }
+
+                    if (!doNotFireEvent && TileStatusChanged != null) {
+                        TileStatusChanged(this, tileStatus);
+                    }
+                }
+            }
+            get {
+                return tileStatus;
+            }
+        }
+
+        // Does not fire TileStatusChanged events.
+        public void Initialize()
+        {
+            doNotFireEvent = true;
+            this.Status = TileStatus.Hidden;
+            this.IsBug = false;
+            this.SurroundingBugCount = 0;
+            doNotFireEvent = false;
+        }
+
+#if FIX_WINDOWS_DOUBLE_TAPS
+
+        bool lastTapSingle;
+        DateTime lastTapTime;
+
+#endif
+
+        void OnSingleTap(object sender, object args)
+        {
+
+#if FIX_WINDOWS_DOUBLE_TAPS
+
+            if (Device.OS == TargetPlatform.Windows || Device.OS == TargetPlatform.WinPhone) {
+                if (lastTapSingle && DateTime.Now - lastTapTime < TimeSpan.FromMilliseconds (500)) {
+                    OnDoubleTap (sender, args);
+                    lastTapSingle = false;
+                } else {
+                    lastTapTime = DateTime.Now;
+                    lastTapSingle = true;
+                }
+        	}
+
+#endif
+
+            switch (this.Status) {
+            case TileStatus.Hidden:
+                this.Status = TileStatus.Flagged;
+                break;
+
+            case TileStatus.Flagged:
+                this.Status = TileStatus.Hidden;
+                break;
+
+            case TileStatus.Exposed:
+                    // Do nothing
+                break;
+            }
+        }
+
+        void OnDoubleTap (object sender, object args)
+        {
+            this.Status = TileStatus.Exposed;
+        }
+    }
+}
diff --git a/Samples/BugSweeperSample.cs b/Samples/BugSweeperSample.cs
new file mode 100644
index 0000000..a6bb529
--- /dev/null
+++ b/Samples/BugSweeperSample.cs
@@ -0,0 +1,16 @@
+using Ooui;
+using Xamarin.Forms;
+
+namespace Samples
+{
+    public class BugSweeperSample : ISample
+    {
+        public string Title => "Xamarin.Forms BugSweeper";
+
+        public Ooui.Element CreateElement ()
+        {
+            var page = new BugSweeper.BugSweeperPage ();
+            return page.GetOouiElement ();
+        }
+    }
+}
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index 8666c6a..72ede52 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -15,6 +15,8 @@
 	
   <ItemGroup>
     <EmbeddedResource Include="**/*.xaml" />
+    <EmbeddedResource Include="BugSweeper\Images\RedBug.png" />
+    <EmbeddedResource Include="BugSweeper\Images\Xamarin120.png" />
   </ItemGroup>
 	
   <ItemGroup>
@@ -41,6 +43,10 @@
     </EmbeddedResource>
   </ItemGroup>
     
+  <ItemGroup>
+    <None Remove="BugSweeper\Images\RedBug.png" />
+    <None Remove="BugSweeper\Images\Xamarin120.png" />
+  </ItemGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>

From 30ca7ed0c56a81335fe4d93964c37a575d9b7af4 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 19:34:36 -0800
Subject: [PATCH 17/36] Improve label and default element measuring

---
 Ooui.Forms/Extensions/ElementExtensions.cs | 4 ++--
 Ooui.Forms/Renderers/LabelRenderer.cs      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Ooui.Forms/Extensions/ElementExtensions.cs b/Ooui.Forms/Extensions/ElementExtensions.cs
index 50b7cb6..53c1366 100644
--- a/Ooui.Forms/Extensions/ElementExtensions.cs
+++ b/Ooui.Forms/Extensions/ElementExtensions.cs
@@ -16,7 +16,7 @@ namespace Ooui.Forms.Extensions
             if (self.Style.Width.Equals ("inherit")) {
                 s = self.Text.MeasureSize (self.Style);
                 measured = true;
-                rw = double.IsPositiveInfinity (s.Width) ? double.PositiveInfinity : s.Width;
+                rw = double.IsPositiveInfinity (s.Width) ? double.PositiveInfinity : Math.Ceiling (s.Width);
             }
             else {
                 rw = self.Style.GetNumberWithUnits ("width", "px", 640);
@@ -27,7 +27,7 @@ namespace Ooui.Forms.Extensions
                     s = self.Text.MeasureSize (self.Style);
                     measured = true;
                 }
-                rh = double.IsPositiveInfinity (s.Height) ? double.PositiveInfinity : s.Height;
+                rh = double.IsPositiveInfinity (s.Height) ? double.PositiveInfinity : Math.Ceiling (s.Height * 1.4);
             }
             else {
                 rh = self.Style.GetNumberWithUnits ("height", "px", 480);
diff --git a/Ooui.Forms/Renderers/LabelRenderer.cs b/Ooui.Forms/Renderers/LabelRenderer.cs
index 6a6104d..4d1884b 100644
--- a/Ooui.Forms/Renderers/LabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LabelRenderer.cs
@@ -18,6 +18,8 @@ namespace Ooui.Forms.Renderers
         {
             if (!_perfectSizeValid) {
                 var size = Element.Text.MeasureSize (Element.FontFamily, Element.FontSize, Element.FontAttributes);
+                size.Width = Math.Ceiling (size.Width);
+                size.Height = Math.Ceiling (size.Height * 1.4);
                 _perfectSize = new SizeRequest (size, size);
                 _perfectSizeValid = true;
             }

From 0b60b4c8005981afbdaf6bc75d1d21ea709797d0 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 19:43:38 -0800
Subject: [PATCH 18/36] Fix label text alignment

---
 Ooui.Forms/Renderers/LabelRenderer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ooui.Forms/Renderers/LabelRenderer.cs b/Ooui.Forms/Renderers/LabelRenderer.cs
index 4d1884b..df396a3 100644
--- a/Ooui.Forms/Renderers/LabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LabelRenderer.cs
@@ -100,8 +100,8 @@ namespace Ooui.Forms.Renderers
 
         void UpdateAlignment ()
         {
-            Control.Style.TextAlign = Element.HorizontalTextAlignment.ToOouiTextAlign ();
-            Control.Style.VerticalAlign = Element.VerticalTextAlignment.ToOouiTextAlign ();
+            this.Style.TextAlign = Element.HorizontalTextAlignment.ToOouiTextAlign ();
+            this.Style.VerticalAlign = Element.VerticalTextAlignment.ToOouiTextAlign ();
         }
 
         void UpdateLineBreakMode ()

From 88a4798acbfb5e9cdd93b6cf1124400a84d475c2 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 20:39:10 -0800
Subject: [PATCH 19/36] Track tap gestures

---
 Ooui.Forms/EventTracker.cs          | 169 ++++++++++++++++++++++++++++
 Ooui.Forms/Platform.cs              |  28 ++++-
 Ooui.Forms/VisualElementRenderer.cs |   9 +-
 3 files changed, 201 insertions(+), 5 deletions(-)
 create mode 100644 Ooui.Forms/EventTracker.cs

diff --git a/Ooui.Forms/EventTracker.cs b/Ooui.Forms/EventTracker.cs
new file mode 100644
index 0000000..d9eb5b5
--- /dev/null
+++ b/Ooui.Forms/EventTracker.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using Xamarin.Forms;
+
+using NativeView = Ooui.Element;
+
+namespace Ooui.Forms
+{
+    public class EventTracker
+    {
+        readonly NotifyCollectionChangedEventHandler _collectionChangedHandler;
+
+        readonly Dictionary<IGestureRecognizer, NativeGestureRecognizer> _gestureRecognizers = new Dictionary<IGestureRecognizer, NativeGestureRecognizer> ();
+
+        readonly IVisualElementRenderer _renderer;
+        bool _disposed;
+        NativeView _handler;
+
+        public EventTracker (IVisualElementRenderer renderer)
+        {
+            if (renderer == null)
+                throw new ArgumentNullException (nameof (renderer));
+
+            _collectionChangedHandler = ModelGestureRecognizersOnCollectionChanged;
+
+            _renderer = renderer;
+            _renderer.ElementChanged += OnElementChanged;
+        }
+
+        ObservableCollection<IGestureRecognizer> ElementGestureRecognizers {
+            get {
+                if (_renderer?.Element is View)
+                    return ((View)_renderer.Element).GestureRecognizers as ObservableCollection<IGestureRecognizer>;
+                return null;
+            }
+        }
+
+        public void Dispose ()
+        {
+            if (_disposed)
+                return;
+
+            _disposed = true;
+
+            foreach (var kvp in _gestureRecognizers) {
+                RemoveGestureRecognizer (_handler, kvp.Value);
+                kvp.Value.Dispose ();
+            }
+
+            _gestureRecognizers.Clear ();
+
+            if (ElementGestureRecognizers != null)
+                ElementGestureRecognizers.CollectionChanged -= _collectionChangedHandler;
+
+            _handler = null;
+        }
+
+        void ModelGestureRecognizersOnCollectionChanged (object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+        {
+            LoadRecognizers ();
+        }
+
+        void OnElementChanged (object sender, VisualElementChangedEventArgs e)
+        {
+            if (e.OldElement != null) {
+                // unhook
+                var oldView = e.OldElement as View;
+                if (oldView != null) {
+                    var oldRecognizers = (ObservableCollection<IGestureRecognizer>)oldView.GestureRecognizers;
+                    oldRecognizers.CollectionChanged -= _collectionChangedHandler;
+                }
+            }
+
+            if (e.NewElement != null) {
+                // hook
+                if (ElementGestureRecognizers != null) {
+                    ElementGestureRecognizers.CollectionChanged += _collectionChangedHandler;
+                    LoadRecognizers ();
+                }
+            }
+        }
+
+        void LoadRecognizers ()
+        {
+            if (ElementGestureRecognizers == null)
+                return;
+
+            foreach (var recognizer in ElementGestureRecognizers) {
+                if (_gestureRecognizers.ContainsKey (recognizer))
+                    continue;
+
+                var nativeRecognizer = GetNativeRecognizer (recognizer);
+                if (nativeRecognizer != null) {
+                    AddGestureRecognizer (_handler, nativeRecognizer);
+
+                    _gestureRecognizers[recognizer] = nativeRecognizer;
+                }
+            }
+
+            var toRemove = _gestureRecognizers.Keys.Where (key => !ElementGestureRecognizers.Contains (key)).ToArray ();
+            foreach (var gestureRecognizer in toRemove) {
+                var uiRecognizer = _gestureRecognizers[gestureRecognizer];
+                _gestureRecognizers.Remove (gestureRecognizer);
+
+                RemoveGestureRecognizer (_handler, uiRecognizer);
+                uiRecognizer.Dispose ();
+            }
+        }
+
+        protected virtual NativeGestureRecognizer GetNativeRecognizer (IGestureRecognizer recognizer)
+        {
+            if (recognizer == null)
+                return null;
+
+            var weakRecognizer = new WeakReference (recognizer);
+            var weakEventTracker = new WeakReference (this);
+
+            var tapRecognizer = recognizer as TapGestureRecognizer;
+            if (tapRecognizer != null) {
+                var returnAction = new TargetEventHandler ((s, e) => {
+                    var tapGestureRecognizer = weakRecognizer.Target as TapGestureRecognizer;
+                    var eventTracker = weakEventTracker.Target as EventTracker;
+                    var view = eventTracker?._renderer?.Element as View;
+
+                    if (tapGestureRecognizer != null && view != null)
+                        tapGestureRecognizer.SendTapped (view);
+                });
+                var uiRecognizer = new NativeGestureRecognizer {
+                    EventType = "click",
+                    Handler = returnAction,
+                };
+                return uiRecognizer;
+            }
+
+            return null;
+        }
+
+        static void AddGestureRecognizer (Element element, NativeGestureRecognizer recognizer)
+        {
+            element.AddEventListener (recognizer.EventType, recognizer.Handler);
+        }
+
+        static void RemoveGestureRecognizer (Element element, NativeGestureRecognizer recognizer)
+        {
+            element.RemoveEventListener (recognizer.EventType, recognizer.Handler);
+        }
+
+        public void LoadEvents (NativeView handler)
+        {
+            if (_disposed)
+                throw new ObjectDisposedException (null);
+
+            _handler = handler;
+            OnElementChanged (this, new VisualElementChangedEventArgs (null, _renderer.Element));
+        }
+
+        protected class NativeGestureRecognizer : IDisposable
+        {
+            public string EventType;
+            public TargetEventHandler Handler;
+            public void Dispose ()
+            {
+            }
+        }
+    }
+}
diff --git a/Ooui.Forms/Platform.cs b/Ooui.Forms/Platform.cs
index 938adb2..96197cb 100644
--- a/Ooui.Forms/Platform.cs
+++ b/Ooui.Forms/Platform.cs
@@ -57,6 +57,10 @@ namespace Ooui.Forms
             MessagingCenter.Unsubscribe<Page, ActionSheetArguments> (this, Page.ActionSheetSignalName);
             MessagingCenter.Unsubscribe<Page, AlertArguments> (this, Page.AlertSignalName);
             MessagingCenter.Unsubscribe<Page, bool> (this, Page.BusySetSignalName);
+
+            DisposeModelAndChildrenRenderers (Page);
+            //foreach (var modal in _modals)
+                //DisposeModelAndChildrenRenderers (modal);
         }
 
         public static IVisualElementRenderer CreateRenderer (VisualElement element)
@@ -110,7 +114,29 @@ namespace Ooui.Forms
 
         void HandleChildRemoved (object sender, ElementEventArgs e)
         {
-            throw new NotImplementedException ();
+            var view = e.Element;
+            DisposeModelAndChildrenRenderers (view);
+        }
+
+        void DisposeModelAndChildrenRenderers (Xamarin.Forms.Element view)
+        {
+            IVisualElementRenderer renderer;
+            foreach (VisualElement child in view.Descendants ()) {
+                renderer = GetRenderer (child);
+                child.ClearValue (RendererProperty);
+
+                if (renderer != null) {
+                    //renderer.NativeView.RemoveFromSuperview ();
+                    renderer.Dispose ();
+                }
+            }
+
+            renderer = GetRenderer ((VisualElement)view);
+            if (renderer != null) {
+                //renderer.NativeView.RemoveFromSuperview ();
+                renderer.Dispose ();
+            }
+            view.ClearValue (RendererProperty);
         }
 
         void AddChild (VisualElement view)
diff --git a/Ooui.Forms/VisualElementRenderer.cs b/Ooui.Forms/VisualElementRenderer.cs
index a9f9af1..f6f4548 100644
--- a/Ooui.Forms/VisualElementRenderer.cs
+++ b/Ooui.Forms/VisualElementRenderer.cs
@@ -38,6 +38,7 @@ namespace Ooui.Forms
 
         VisualElementRendererFlags _flags = VisualElementRendererFlags.AutoPackage | VisualElementRendererFlags.AutoTrack;
 
+        EventTracker _events;
         VisualElementPackager _packager;
         VisualElementTracker _tracker;
 
@@ -107,10 +108,10 @@ namespace Ooui.Forms
                 	_packager.Load ();
                 }
 
-                //if (AutoTrack && _events == null) {
-                //	_events = new EventTracker (this);
-                //	_events.LoadEvents (this);
-                //}
+                if (AutoTrack && _events == null) {
+                	_events = new EventTracker (this);
+                	_events.LoadEvents (this);
+                }
 
                 element.PropertyChanged += _propertyChangedHandler;
             }

From 33e1a65f5985da892d5934cca2f5982c46d0752c Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 22:19:16 -0800
Subject: [PATCH 20/36] Implement the platform ticker

---
 Ooui.Forms/Forms.cs                   | 36 +++++++++++++++++++++------
 Ooui.Forms/Renderers/LabelRenderer.cs |  3 +++
 Ooui/UI.cs                            |  4 ++-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Ooui.Forms/Forms.cs b/Ooui.Forms/Forms.cs
index c5a39f7..991c264 100644
--- a/Ooui.Forms/Forms.cs
+++ b/Ooui.Forms/Forms.cs
@@ -30,9 +30,9 @@ namespace Xamarin.Forms
 
             Registrar.RegisterAll (new[] {
                 typeof(ExportRendererAttribute),
-				//typeof(ExportCellAttribute),
-				//typeof(ExportImageSourceHandlerAttribute),
-			});
+                //typeof(ExportCellAttribute),
+                //typeof(ExportImageSourceHandlerAttribute),
+            });
         }
 
         public static event EventHandler<ViewInitializedEventArgs> ViewInitialized;
@@ -62,11 +62,6 @@ namespace Xamarin.Forms
                 Task.Run (action);
             }
 
-            public Ticker CreateTicker ()
-            {
-                throw new NotImplementedException ();
-            }
-
             public Assembly[] GetAssemblies ()
             {
                 return AppDomain.CurrentDomain.GetAssemblies ();
@@ -119,6 +114,31 @@ namespace Xamarin.Forms
                     }
                 }), null, (int)interval.TotalMilliseconds, (int)interval.TotalMilliseconds);
             }
+
+            public Ticker CreateTicker ()
+            {
+                return new OouiTicker ();
+            }
+
+            class OouiTicker : Ticker
+            {
+                Timer timer;
+                protected override void DisableTimer ()
+                {
+                    var t = timer;
+                    timer = null;
+                    t?.Dispose ();
+                }
+                protected override void EnableTimer ()
+                {
+                    if (timer != null)
+                        return;
+                    var interval = TimeSpan.FromSeconds (1.0 / Ooui.UI.Session.MaxFps);
+                    timer = new Timer ((_ => {
+                        this.SendSignals ();
+                    }), null, (int)interval.TotalMilliseconds, (int)interval.TotalMilliseconds);
+                }
+            }
         }
 
         public class ViewInitializedEventArgs
diff --git a/Ooui.Forms/Renderers/LabelRenderer.cs b/Ooui.Forms/Renderers/LabelRenderer.cs
index df396a3..9be0486 100644
--- a/Ooui.Forms/Renderers/LabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LabelRenderer.cs
@@ -74,6 +74,9 @@ namespace Ooui.Forms.Renderers
         {
             base.OnElementPropertyChanged (sender, e);
 
+            if (Control == null)
+                return;
+
             if (e.PropertyName == Xamarin.Forms.Label.HorizontalTextAlignmentProperty.PropertyName)
                 UpdateAlignment ();
             else if (e.PropertyName == Xamarin.Forms.Label.VerticalTextAlignmentProperty.PropertyName)
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index 768d992..a422abf 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -522,9 +522,11 @@ namespace Ooui
             readonly HashSet<string> createdIds;
             readonly List<Message> queuedMessages = new List<Message> ();
 
+            public const int MaxFps = 30;
+
             readonly System.Timers.Timer sendThrottle;
             DateTime lastTransmitTime = DateTime.MinValue;
-            readonly TimeSpan throttleInterval = TimeSpan.FromSeconds (1.0 / 30); // 30 FPS max
+            readonly TimeSpan throttleInterval = TimeSpan.FromSeconds (1.0 / MaxFps);
             readonly double initialWidth;
             readonly double initialHeight;
 

From 4f047d1e85a5bd5da130b4c61c8b955f29da53b2 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 22:37:25 -0800
Subject: [PATCH 21/36] Add FrameRenderer

---
 Ooui.Forms/Exports.cs                 |  1 +
 Ooui.Forms/Renderers/FrameRenderer.cs | 64 +++++++++++++++++++++++++++
 Ooui/Style.cs                         | 20 +++++----
 3 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 Ooui.Forms/Renderers/FrameRenderer.cs

diff --git a/Ooui.Forms/Exports.cs b/Ooui.Forms/Exports.cs
index c823d1b..5388bab 100644
--- a/Ooui.Forms/Exports.cs
+++ b/Ooui.Forms/Exports.cs
@@ -11,6 +11,7 @@ using Xamarin.Forms.Internals;
 [assembly: ExportRenderer (typeof (DatePicker), typeof (DatePickerRenderer))]
 [assembly: ExportRenderer (typeof (Editor), typeof (EditorRenderer))]
 [assembly: ExportRenderer (typeof (Entry), typeof (EntryRenderer))]
+[assembly: ExportRenderer (typeof (Frame), typeof (FrameRenderer))]
 [assembly: ExportRenderer (typeof (Label), typeof (LabelRenderer))]
 [assembly: ExportRenderer (typeof (ProgressBar), typeof (ProgressBarRenderer))]
 
diff --git a/Ooui.Forms/Renderers/FrameRenderer.cs b/Ooui.Forms/Renderers/FrameRenderer.cs
new file mode 100644
index 0000000..752f534
--- /dev/null
+++ b/Ooui.Forms/Renderers/FrameRenderer.cs
@@ -0,0 +1,64 @@
+using System;
+using System.ComponentModel;
+using Xamarin.Forms;
+using Ooui.Forms.Extensions;
+
+namespace Ooui.Forms.Renderers
+{
+    public class FrameRenderer : VisualElementRenderer<Frame>
+    {
+        protected override void OnElementChanged (ElementChangedEventArgs<Frame> e)
+        {
+            base.OnElementChanged (e);
+
+            if (e.NewElement != null)
+                SetupLayer ();
+        }
+
+        protected override void OnElementPropertyChanged (object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged (sender, e);
+
+            if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName ||
+                e.PropertyName == Xamarin.Forms.Frame.OutlineColorProperty.PropertyName ||
+                e.PropertyName == Xamarin.Forms.Frame.HasShadowProperty.PropertyName ||
+                e.PropertyName == Xamarin.Forms.Frame.CornerRadiusProperty.PropertyName)
+                SetupLayer ();
+        }
+
+        void SetupLayer ()
+        {
+            float cornerRadius = Element.CornerRadius;
+
+            if (cornerRadius == -1f)
+                cornerRadius = 5f; // default corner radius
+
+            var Layer = this.Style;
+
+            Layer.BorderRadius = cornerRadius;
+
+            if (Element.BackgroundColor == Xamarin.Forms.Color.Default)
+                Layer.BackgroundColor = "white";
+            else
+                Layer.BackgroundColor = Element.BackgroundColor.ToOouiColor ();
+
+            if (Element.HasShadow) {
+                //Layer.ShadowRadius = 5;
+                //Layer.ShadowColor = "black";
+                //Layer.ShadowOpacity = 0.8f;
+                //Layer.ShadowOffset = new SizeF ();
+            }
+            else {
+                //Layer.ShadowOpacity = 0;
+            }
+
+            if (Element.OutlineColor == Xamarin.Forms.Color.Default)
+                Layer.BorderColor = Colors.Clear;
+            else {
+                Layer.BorderColor = Element.OutlineColor.ToOouiColor ();
+                Layer.BorderWidth = 1;
+                Layer.BorderStyle = "solid";
+            }
+        }
+    }
+}
diff --git a/Ooui/Style.cs b/Ooui/Style.cs
index 06b6149..4163f75 100644
--- a/Ooui/Style.cs
+++ b/Ooui/Style.cs
@@ -93,38 +93,38 @@ namespace Ooui
 
         public Value BorderTopWidth {
             get => this["border-top-width"];
-            set => this["border-top-width"] = value;
+            set => this["border-top-width"] = AddNumberUnits (value, "px");
         }
 
         public Value BorderRightWidth {
             get => this["border-right-width"];
-            set => this["border-right-width"] = value;
+            set => this["border-right-width"] = AddNumberUnits (value, "px");
         }
 
         public Value BorderBottomWidth {
             get => this["border-bottom-width"];
-            set => this["border-bottom-width"] = value;
+            set => this["border-bottom-width"] = AddNumberUnits (value, "px");
         }
 
         public Value BorderLeftWidth {
             get => this["border-left-width"];
-            set => this["border-left-width"] = value;
+            set => this["border-left-width"] = AddNumberUnits (value, "px");
         }
 
         public Value BorderRadius {
             get => this["border-radius"];
             set {
-                this["border-radius"] = value;
+                this["border-radius"] = AddNumberUnits (value, "px");
             }
         }
 
         public Value BorderWidth {
             get => this["border-top-width"];
             set {
-                this["border-top-width"] = value;
-                this["border-right-width"] = value;
-                this["border-bottom-width"] = value;
-                this["border-left-width"] = value;
+                this["border-top-width"] = AddNumberUnits (value, "px");
+                this["border-right-width"] = AddNumberUnits (value, "px");
+                this["border-bottom-width"] = AddNumberUnits (value, "px");
+                this["border-left-width"] = AddNumberUnits (value, "px");
             }
         }
 
@@ -403,6 +403,8 @@ namespace Ooui
 
         static string AddNumberUnits (object val, string units)
         {
+            if (val == null)
+                return null;
             if (val is string s)
                 return s;
             if (val is IConvertible c)

From 72af1a8a3a7039b99208f2964645e5dd96519ea3 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 22:46:27 -0800
Subject: [PATCH 22/36] Add double click recognizer

---
 Ooui.Forms/EventTracker.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Ooui.Forms/EventTracker.cs b/Ooui.Forms/EventTracker.cs
index d9eb5b5..afa79f0 100644
--- a/Ooui.Forms/EventTracker.cs
+++ b/Ooui.Forms/EventTracker.cs
@@ -119,7 +119,7 @@ namespace Ooui.Forms
             var weakEventTracker = new WeakReference (this);
 
             var tapRecognizer = recognizer as TapGestureRecognizer;
-            if (tapRecognizer != null) {
+            if (tapRecognizer != null && tapRecognizer.NumberOfTapsRequired == 1) {
                 var returnAction = new TargetEventHandler ((s, e) => {
                     var tapGestureRecognizer = weakRecognizer.Target as TapGestureRecognizer;
                     var eventTracker = weakEventTracker.Target as EventTracker;
@@ -134,6 +134,21 @@ namespace Ooui.Forms
                 };
                 return uiRecognizer;
             }
+            if (tapRecognizer != null && tapRecognizer.NumberOfTapsRequired == 2) {
+                var returnAction = new TargetEventHandler ((s, e) => {
+                    var tapGestureRecognizer = weakRecognizer.Target as TapGestureRecognizer;
+                    var eventTracker = weakEventTracker.Target as EventTracker;
+                    var view = eventTracker?._renderer?.Element as View;
+
+                    if (tapGestureRecognizer != null && view != null)
+                        tapGestureRecognizer.SendTapped (view);
+                });
+                var uiRecognizer = new NativeGestureRecognizer {
+                    EventType = "dblclick",
+                    Handler = returnAction,
+                };
+                return uiRecognizer;
+            }
 
             return null;
         }

From 85c7c74270dee0bafa4b471f7f6b540cca5b4b6e Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 23:10:35 -0800
Subject: [PATCH 23/36] Fix label vertical alignment

---
 Ooui.Forms/Extensions/FontExtensions.cs | 13 +++++++++++++
 Ooui.Forms/Renderers/LabelRenderer.cs   |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Ooui.Forms/Extensions/FontExtensions.cs b/Ooui.Forms/Extensions/FontExtensions.cs
index 8c53312..f364559 100644
--- a/Ooui.Forms/Extensions/FontExtensions.cs
+++ b/Ooui.Forms/Extensions/FontExtensions.cs
@@ -83,6 +83,19 @@ namespace Ooui.Forms.Extensions
             }
         }
 
+        public static string ToOouiVerticalAlign (this TextAlignment align)
+        {
+            switch (align) {
+                case TextAlignment.Start:
+                default:
+                    return "top";
+                case TextAlignment.Center:
+                    return "middle";
+                case TextAlignment.End:
+                    return "bottom";
+            }
+        }
+
         static readonly double[] CharacterProportions = {
             0, 0, 0, 0, 0, 0, 0, 0,
             0, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0.27799999713897705, 0, 0,
diff --git a/Ooui.Forms/Renderers/LabelRenderer.cs b/Ooui.Forms/Renderers/LabelRenderer.cs
index 9be0486..85ddc50 100644
--- a/Ooui.Forms/Renderers/LabelRenderer.cs
+++ b/Ooui.Forms/Renderers/LabelRenderer.cs
@@ -103,8 +103,10 @@ namespace Ooui.Forms.Renderers
 
         void UpdateAlignment ()
         {
+            this.Style.Display = "table";
+            Control.Style.Display = "table-cell";
             this.Style.TextAlign = Element.HorizontalTextAlignment.ToOouiTextAlign ();
-            this.Style.VerticalAlign = Element.VerticalTextAlignment.ToOouiTextAlign ();
+            Control.Style.VerticalAlign = Element.VerticalTextAlignment.ToOouiVerticalAlign ();
         }
 
         void UpdateLineBreakMode ()

From 11d9e1c2fbbc2a076d4dcadf8ed934df53784128 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sat, 9 Dec 2017 23:22:39 -0800
Subject: [PATCH 24/36] Give the editor a default size

---
 Ooui.Forms/Renderers/EditorRenderer.cs | 6 ++++++
 Samples/EditorSample.cs                | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Ooui.Forms/Renderers/EditorRenderer.cs b/Ooui.Forms/Renderers/EditorRenderer.cs
index a61a7e1..828287c 100644
--- a/Ooui.Forms/Renderers/EditorRenderer.cs
+++ b/Ooui.Forms/Renderers/EditorRenderer.cs
@@ -10,6 +10,12 @@ namespace Ooui.Forms.Renderers
         bool _disposed;
         IEditorController ElementController => Element;
 
+        public override SizeRequest GetDesiredSize (double widthConstraint, double heightConstraint)
+        {
+            var size = new Size (160, 100);
+            return new SizeRequest (size, size);
+        }
+
         protected override void Dispose (bool disposing)
         {
             if (_disposed)
diff --git a/Samples/EditorSample.cs b/Samples/EditorSample.cs
index 494b9dc..ef0464e 100644
--- a/Samples/EditorSample.cs
+++ b/Samples/EditorSample.cs
@@ -5,7 +5,7 @@ namespace Samples
 {
     public class EditorSample : ISample
     {
-        public string Title => "Editor Sample";
+        public string Title => "Xamarin.Forms Editor Sample";
 
         public Ooui.Element CreateElement()
         {
@@ -13,7 +13,9 @@ namespace Samples
 
             var titleLabel = new Xamarin.Forms.Label
             {
-                Text = "Editor"
+                Text = "Editor",
+                FontSize = 24,
+                FontAttributes = FontAttributes.Bold,
             };
             panel.Children.Add(titleLabel);
 

From 57f98b7d61c243c54d66db14f952e93cb41ea989 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 14:21:49 -0800
Subject: [PATCH 25/36] Implement SwitchRenderer using Bootstrap Toggle

---
 Ooui.Forms/Exports.cs                  |  1 +
 Ooui.Forms/Renderers/SwitchRenderer.cs | 53 ++++++++++++++++++++++++++
 Ooui/CanvasRenderingContext2D.cs       | 38 +++++++++---------
 Ooui/Client.js                         | 16 ++++++--
 Ooui/Element.cs                        | 14 +++++++
 Ooui/EventTarget.cs                    |  2 +-
 Ooui/Node.cs                           |  6 +--
 Ooui/UI.cs                             |  4 ++
 Samples/DisplayAlertPage.xaml          |  4 ++
 9 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 Ooui.Forms/Renderers/SwitchRenderer.cs

diff --git a/Ooui.Forms/Exports.cs b/Ooui.Forms/Exports.cs
index 5388bab..a467bf5 100644
--- a/Ooui.Forms/Exports.cs
+++ b/Ooui.Forms/Exports.cs
@@ -14,6 +14,7 @@ using Xamarin.Forms.Internals;
 [assembly: ExportRenderer (typeof (Frame), typeof (FrameRenderer))]
 [assembly: ExportRenderer (typeof (Label), typeof (LabelRenderer))]
 [assembly: ExportRenderer (typeof (ProgressBar), typeof (ProgressBarRenderer))]
+[assembly: ExportRenderer (typeof (Switch), typeof (SwitchRenderer))]
 
 namespace Ooui.Forms
 {
diff --git a/Ooui.Forms/Renderers/SwitchRenderer.cs b/Ooui.Forms/Renderers/SwitchRenderer.cs
new file mode 100644
index 0000000..75f1a7f
--- /dev/null
+++ b/Ooui.Forms/Renderers/SwitchRenderer.cs
@@ -0,0 +1,53 @@
+using System;
+using Xamarin.Forms;
+
+namespace Ooui.Forms.Renderers
+{
+    public class SwitchRenderer : ViewRenderer<Switch, Input>
+    {
+        public override SizeRequest GetDesiredSize (double widthConstraint, double heightConstraint)
+        {
+            var size = new Size (54, 38);
+            return new SizeRequest (size, size);
+        }
+
+        protected override void Dispose (bool disposing)
+        {
+            if (disposing)
+                Control.Changed -= OnControlValueChanged;
+
+            base.Dispose (disposing);
+        }
+
+        protected override void OnElementChanged (ElementChangedEventArgs<Switch> e)
+        {
+            if (e.OldElement != null)
+                e.OldElement.Toggled -= OnElementToggled;
+
+            if (e.NewElement != null) {
+                if (Control == null) {
+                    var input = new Input (InputType.Checkbox);
+                    input.SetAttribute ("data-toggle", "toggle");
+                    SetNativeControl (input);
+                    input.Call ("$.bootstrapToggle");
+                    Control.Changed += OnControlValueChanged;
+                }
+
+                Control.IsChecked = Element.IsToggled;
+                e.NewElement.Toggled += OnElementToggled;
+            }
+
+            base.OnElementChanged (e);
+        }
+
+        void OnControlValueChanged (object sender, EventArgs e)
+        {
+            ((IElementController)Element).SetValueFromRenderer (Switch.IsToggledProperty, Control.IsChecked);
+        }
+
+        void OnElementToggled (object sender, EventArgs e)
+        {
+            Control.IsChecked = Element.IsToggled;
+        }
+    }
+}
diff --git a/Ooui/CanvasRenderingContext2D.cs b/Ooui/CanvasRenderingContext2D.cs
index 210017d..64d80f8 100644
--- a/Ooui/CanvasRenderingContext2D.cs
+++ b/Ooui/CanvasRenderingContext2D.cs
@@ -81,97 +81,97 @@ namespace Ooui
 
         public void Save ()
         {
-            SendCall ("save");
+            Call ("save");
         }
 
         public void Restore ()
         {
-            SendCall ("restore");
+            Call ("restore");
         }
 
         public void ClearRect (double x, double y, double w, double h)
         {
-            SendCall ("clearRect", x, y, w, h);
+            Call ("clearRect", x, y, w, h);
         }
 
         public void FillRect (double x, double y, double w, double h)
         {
-            SendCall ("fillRect", x, y, w, h);
+            Call ("fillRect", x, y, w, h);
         }
 
         public void StrokeRect (double x, double y, double w, double h)
         {
-            SendCall ("strokeRect", x, y, w, h);
+            Call ("strokeRect", x, y, w, h);
         }
 
         public void BeginPath ()
         {
-            SendCall ("beginPath");
+            Call ("beginPath");
         }
 
         public void ClosePath ()
         {
-            SendCall ("closePath");
+            Call ("closePath");
         }
 
         public void MoveTo (double x, double y)
         {
-            SendCall ("moveTo", x, y);
+            Call ("moveTo", x, y);
         }
 
         public void LineTo (double x, double y)
         {
-            SendCall ("lineTo", x, y);
+            Call ("lineTo", x, y);
         }
 
         public void QuadraticCurveTo (double cpx, double cpy, double x, double y)
         {
-            SendCall ("quadraticCurveTo", cpx, cpy, x, y);
+            Call ("quadraticCurveTo", cpx, cpy, x, y);
         }
 
         public void BezierCurveTo (double cp1x, double cp1y, double cp2x, double cp2y, double x, double y)
         {
-            SendCall ("bezierCurveTo", cp1x, cp1y, cp2x, cp2y, x, y);
+            Call ("bezierCurveTo", cp1x, cp1y, cp2x, cp2y, x, y);
         }
 
         public void ArcTo (double x1, double y1, double x2, double y2, double radius)
         {
-            SendCall ("arcTo", x1, y1, x2, y2, radius);
+            Call ("arcTo", x1, y1, x2, y2, radius);
         }
 
         public void Rect (double x, double y, double w, double h)
         {
-            SendCall ("rect", x, y, w, h);
+            Call ("rect", x, y, w, h);
         }
 
         public void Arc (double x, double y, double radius, double startAngle, double endAngle, bool counterclockwise)
         {
-            SendCall ("arc", x, y, radius, startAngle, endAngle, counterclockwise);
+            Call ("arc", x, y, radius, startAngle, endAngle, counterclockwise);
         }
 
         public void Fill ()
         {
-            SendCall ("fill");
+            Call ("fill");
         }
 
         public void Stroke ()
         {
-            SendCall ("stroke");
+            Call ("stroke");
         }
 
         public void Clip ()
         {
-            SendCall ("clip");
+            Call ("clip");
         }
 
         public void FillText (string text, double x, double y, double? maxWidth)
         {
-            SendCall ("fillText", text, x, y, maxWidth);
+            Call ("fillText", text, x, y, maxWidth);
         }
 
         public void StrokeText (string text, double x, double y, double? maxWidth)
         {
-            SendCall ("strokeText", text, x, y, maxWidth);
+            Call ("strokeText", text, x, y, maxWidth);
         }
     }
 
diff --git a/Ooui/Client.js b/Ooui/Client.js
index e796069..faac03a 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -65,11 +65,19 @@ function ooui (rootElementPath) {
         const messages = JSON.parse (event.data);
         if (debug) console.log("Messages", messages);
         if (Array.isArray (messages)) {
+            const jqs = []
             messages.forEach (function (m) {
                 // console.log('Raw value from server', m.v);
                 m.v = fixupValue (m.v);
-                processMessage (m);
+                if (m.k.startsWith ("$.")) {
+                    jqs.push (m);
+                }
+                else {
+                    processMessage (m);
+                }
             });
+            // Run jQuery functions last since they usually require a fully built DOM
+            jqs.forEach (processMessage);
         }
     });
 
@@ -163,9 +171,11 @@ function msgCall (m) {
         console.error ("Unknown node id", m);
         return;
     }
-    const f = node[m.k];
+    const isJQuery = m.k.startsWith ("$.");
+    const target = isJQuery ? $(node) : node;
+    const f = isJQuery ? target[m.k.slice(2)] : target[m.k];
     if (debug) console.log ("Call", node, f, m.v);
-    const r = f.apply (node, m.v);
+    const r = f.apply (target, m.v);
     if (typeof m.rid === 'string' || m.rid instanceof String) {
         nodes[m.rid] = r;
     }
diff --git a/Ooui/Element.cs b/Ooui/Element.cs
index a7287d1..ea87569 100644
--- a/Ooui/Element.cs
+++ b/Ooui/Element.cs
@@ -116,5 +116,19 @@ namespace Ooui
         {
             SendSet ("style." + Style.GetJsName (e.PropertyName), Style[e.PropertyName]);
         }
+
+        protected override bool SaveStateMessageIfNeeded (Message message)
+        {
+            if (message.TargetId != Id)
+                return false;
+
+            switch (message.MessageType) {
+                case MessageType.Call when message.Key.StartsWith ("$.", StringComparison.Ordinal):
+                    AddStateMessage (message);
+                    return true;
+                default:
+                    return base.SaveStateMessageIfNeeded (message);
+            }
+        }
     }
 }
diff --git a/Ooui/EventTarget.cs b/Ooui/EventTarget.cs
index a7be894..e3e26c1 100644
--- a/Ooui/EventTarget.cs
+++ b/Ooui/EventTarget.cs
@@ -115,7 +115,7 @@ namespace Ooui
             MessageSent?.Invoke (message);
         }
 
-        protected void SendCall (string methodName, params object[] args)
+        public void Call (string methodName, params object[] args)
         {
             Send (Message.Call (Id, methodName, args));
         }
diff --git a/Ooui/Node.cs b/Ooui/Node.cs
index 2443a2b..18d16a0 100644
--- a/Ooui/Node.cs
+++ b/Ooui/Node.cs
@@ -73,7 +73,7 @@ namespace Ooui
                 }
             }
             newChild.MessageSent += HandleChildMessageSent;
-            SendCall ("insertBefore", newChild, referenceChild);
+            Call ("insertBefore", newChild, referenceChild);
             OnChildInsertedBefore (newChild, referenceChild);
             return newChild;
         }
@@ -88,7 +88,7 @@ namespace Ooui
                 }
             }
             child.MessageSent -= HandleChildMessageSent;
-            SendCall ("removeChild", child);
+            Call ("removeChild", child);
             OnChildRemoved (child);
             return child;
         }
@@ -110,7 +110,7 @@ namespace Ooui
             }
             foreach (var child in toRemove) {
                 child.MessageSent -= HandleChildMessageSent;
-                SendCall ("removeChild", child);
+                Call ("removeChild", child);
             }
             InsertBefore (newNode, null);
         }
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index a422abf..aa0f75e 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -40,10 +40,14 @@ namespace Ooui
   <title>@Title</title>
   <meta name=""viewport"" content=""width=device-width, initial-scale=1"" />
   <link rel=""stylesheet"" href=""https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"" />
+  <link rel=""stylesheet"" href=""https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css"" />
   <style>@Styles</style>
 </head>
 <body>
 <div id=""ooui-body"" class=""container-fluid""></div>
+
+<script type=""text/javascript"" src=""https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js""></script>
+<script type=""text/javascript"" src=""https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js""></script>
 <script src=""/ooui.js""></script>
 <script>ooui(""@WebSocketPath"");</script>
 </body>
diff --git a/Samples/DisplayAlertPage.xaml b/Samples/DisplayAlertPage.xaml
index ca53abc..63fee3a 100644
--- a/Samples/DisplayAlertPage.xaml
+++ b/Samples/DisplayAlertPage.xaml
@@ -9,6 +9,10 @@
             <ActivityIndicator x:Name="activity" />
             <ProgressBar x:Name="progress" />
             <DatePicker x:Name="datePicker" />
+            <StackLayout Orientation="Horizontal">
+                <Switch x:Name="switch1" IsToggled="true" />
+                <Switch x:Name="switch2" IsToggled="false" />
+            </StackLayout>
             <Button Text="Tap to Display Alert"
                     Clicked="OnButtonClicked" />
         </StackLayout>

From 7d9d4e426507780cecd7084a002cdb35e3df6868 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 14:26:59 -0800
Subject: [PATCH 26/36] Update test with new px behavior

---
 Tests/StyleTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/StyleTests.cs b/Tests/StyleTests.cs
index 35772ff..731480c 100644
--- a/Tests/StyleTests.cs
+++ b/Tests/StyleTests.cs
@@ -75,7 +75,7 @@ namespace Tests
         {
             var s = new Style ();
             s.BorderLeftWidth = 3.142;
-            Assert.AreEqual ("border-left-width:3.142", s.ToString ());
+            Assert.AreEqual ("border-left-width:3.142px", s.ToString ());
         }
 
         [TestMethod]

From 8a27f336bd4ea27f24d8800a46c1aaa0fe5d5dd8 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 15:07:33 -0800
Subject: [PATCH 27/36] Rename events to be DOM names (fix #41)

---
 Ooui.Forms/DisplayAlert.cs                      | 16 ++++++++--------
 Ooui.Forms/Renderers/ButtonRenderer.cs          |  4 ++--
 Ooui.Forms/Renderers/DatePickerRenderer.cs      |  8 ++++----
 Ooui.Forms/Renderers/EditorRenderer.cs          |  8 ++++----
 Ooui.Forms/Renderers/EntryRenderer.cs           | 12 ++++++------
 Ooui.Forms/Renderers/SwitchRenderer.cs          |  4 ++--
 Ooui/Element.cs                                 | 14 +++++++-------
 Ooui/Form.cs                                    |  2 +-
 Ooui/Input.cs                                   |  9 ++-------
 Ooui/Select.cs                                  |  6 +++---
 Ooui/TextArea.cs                                |  6 +++---
 Ooui/TextInput.cs                               | 17 +++++++++++++++++
 .../Controllers/SamplesController.cs            |  2 +-
 README.md                                       |  4 ++--
 Samples/ButtonSample.cs                         |  2 +-
 Samples/DrawSample.cs                           |  4 ++--
 Samples/TodoSample.cs                           |  8 ++++----
 Tests/ButtonTests.cs                            |  2 +-
 Tests/NodeTests.cs                              |  2 +-
 19 files changed, 71 insertions(+), 59 deletions(-)
 create mode 100644 Ooui/TextInput.cs

diff --git a/Ooui.Forms/DisplayAlert.cs b/Ooui.Forms/DisplayAlert.cs
index d5f22f5..fae811a 100644
--- a/Ooui.Forms/DisplayAlert.cs
+++ b/Ooui.Forms/DisplayAlert.cs
@@ -59,7 +59,7 @@ namespace Ooui.Forms
                 {
                     ClassName = "btn btn-default"
                 };
-                _cancelButton.Clicked += (s, e) => SetResult(false);
+                _cancelButton.Click += (s, e) => SetResult(false);
 
                 footer.AppendChild(_cancelButton);
 
@@ -70,7 +70,7 @@ namespace Ooui.Forms
                         ClassName = "btn btn-default"
                     };
 
-                    _acceptButton.Clicked += (s, e) => SetResult(true);
+                    _acceptButton.Click += (s, e) => SetResult(true);
                     footer.AppendChild(_acceptButton);
                 }
 
@@ -90,23 +90,23 @@ namespace Ooui.Forms
         {
             add
             {
-                _closeButton.Clicked += value;
+                _closeButton.Click += value;
 
                 if(_cancelButton != null)
-                    _cancelButton.Clicked += value;
+                    _cancelButton.Click += value;
 
                 if(_acceptButton != null)
-                    _acceptButton.Clicked += value;
+                    _acceptButton.Click += value;
             }
             remove
             {
-                _closeButton.Clicked -= value;
+                _closeButton.Click -= value;
 
                 if (_cancelButton != null)
-                    _cancelButton.Clicked -= value;
+                    _cancelButton.Click -= value;
 
                 if (_acceptButton != null)
-                    _acceptButton.Clicked -= value;
+                    _acceptButton.Click -= value;
             }
         }
         public Element Element { get; private set; } 
diff --git a/Ooui.Forms/Renderers/ButtonRenderer.cs b/Ooui.Forms/Renderers/ButtonRenderer.cs
index 727d835..04f30b2 100644
--- a/Ooui.Forms/Renderers/ButtonRenderer.cs
+++ b/Ooui.Forms/Renderers/ButtonRenderer.cs
@@ -22,7 +22,7 @@ namespace Ooui.Forms.Renderers
         protected override void Dispose (bool disposing)
         {
             if (Control != null) {
-                Control.Clicked -= OnButtonTouchUpInside;
+                Control.Click -= OnButtonTouchUpInside;
             }
 
             base.Dispose (disposing);
@@ -44,7 +44,7 @@ namespace Ooui.Forms.Renderers
                     _buttonTextColorDefaultHighlighted = Ooui.Colors.Black;
                     _buttonTextColorDefaultDisabled = Ooui.Colors.Black;
 
-                    Control.Clicked += OnButtonTouchUpInside;
+                    Control.Click += OnButtonTouchUpInside;
                 }
 
                 UpdateText ();
diff --git a/Ooui.Forms/Renderers/DatePickerRenderer.cs b/Ooui.Forms/Renderers/DatePickerRenderer.cs
index 79bb422..3df8d05 100644
--- a/Ooui.Forms/Renderers/DatePickerRenderer.cs
+++ b/Ooui.Forms/Renderers/DatePickerRenderer.cs
@@ -31,8 +31,8 @@ namespace Ooui.Forms.Renderers
                     Type = InputType.Date,
                 };
 
-                entry.Inputted += OnStarted;
-                entry.Changed += OnEnded;
+                //entry.Input += OnStarted;
+                entry.Change += OnEnded;
 
                 SetNativeControl (entry);
             }
@@ -100,8 +100,8 @@ namespace Ooui.Forms.Renderers
 
             if (disposing) {
                 if (Control != null) {
-                    Control.Inputted -= OnStarted;
-                    Control.Changed -= OnEnded;
+                    //Control.Input -= OnStarted;
+                    Control.Change -= OnEnded;
                 }
             }
 
diff --git a/Ooui.Forms/Renderers/EditorRenderer.cs b/Ooui.Forms/Renderers/EditorRenderer.cs
index 828287c..84a8f60 100644
--- a/Ooui.Forms/Renderers/EditorRenderer.cs
+++ b/Ooui.Forms/Renderers/EditorRenderer.cs
@@ -25,9 +25,9 @@ namespace Ooui.Forms.Renderers
 
             if (disposing) {
                 if (Control != null) {
-                    Control.Inputted -= HandleChanged;
+                    Control.Input -= HandleChanged;
                     //Control.Started -= OnStarted;
-                    Control.Changed -= OnEnded;
+                    Control.Change -= OnEnded;
                 }
             }
 
@@ -46,9 +46,9 @@ namespace Ooui.Forms.Renderers
                     ClassName = "form-control"
                 });
 
-                Control.Inputted += HandleChanged;
+                Control.Input += HandleChanged;
                 //Control.Started += OnStarted;
-                Control.Changed += OnEnded;
+                Control.Change += OnEnded;
             }
 
             UpdateText ();
diff --git a/Ooui.Forms/Renderers/EntryRenderer.cs b/Ooui.Forms/Renderers/EntryRenderer.cs
index b4e5dfd..63a8750 100644
--- a/Ooui.Forms/Renderers/EntryRenderer.cs
+++ b/Ooui.Forms/Renderers/EntryRenderer.cs
@@ -6,7 +6,7 @@ using Xamarin.Forms;
 
 namespace Ooui.Forms.Renderers
 {
-    public class EntryRenderer : ViewRenderer<Entry, Ooui.Input>
+    public class EntryRenderer : ViewRenderer<Entry, Ooui.TextInput>
     {
         Ooui.Color _defaultTextColor;
         bool _disposed;
@@ -32,8 +32,8 @@ namespace Ooui.Forms.Renderers
             if (disposing) {
                 if (Control != null) {
                     //Control.Inputted -= OnEditingBegan;
-                    Control.Inputted -= OnEditingChanged;
-                    Control.Changed -= OnEditingEnded;
+                    Control.Input -= OnEditingChanged;
+                    Control.Change -= OnEditingEnded;
                 }
             }
 
@@ -48,7 +48,7 @@ namespace Ooui.Forms.Renderers
                 return;
 
             if (Control == null) {
-                var textField = new Ooui.Input (InputType.Text);
+                var textField = new Ooui.TextInput ();
                 SetNativeControl (textField);
 
                 Debug.Assert (Control != null, "Control != null");
@@ -57,10 +57,10 @@ namespace Ooui.Forms.Renderers
 
                 _defaultTextColor = Colors.Black;
 
-                textField.Inputted += OnEditingChanged;
+                textField.Input += OnEditingChanged;
 
                 //textField.EditingDidBegin += OnEditingBegan;
-                textField.Changed += OnEditingEnded;
+                textField.Change += OnEditingEnded;
             }
 
             UpdatePlaceholder ();
diff --git a/Ooui.Forms/Renderers/SwitchRenderer.cs b/Ooui.Forms/Renderers/SwitchRenderer.cs
index 75f1a7f..737eb50 100644
--- a/Ooui.Forms/Renderers/SwitchRenderer.cs
+++ b/Ooui.Forms/Renderers/SwitchRenderer.cs
@@ -14,7 +14,7 @@ namespace Ooui.Forms.Renderers
         protected override void Dispose (bool disposing)
         {
             if (disposing)
-                Control.Changed -= OnControlValueChanged;
+                Control.Change -= OnControlValueChanged;
 
             base.Dispose (disposing);
         }
@@ -30,7 +30,7 @@ namespace Ooui.Forms.Renderers
                     input.SetAttribute ("data-toggle", "toggle");
                     SetNativeControl (input);
                     input.Call ("$.bootstrapToggle");
-                    Control.Changed += OnControlValueChanged;
+                    Control.Change += OnControlValueChanged;
                 }
 
                 Control.IsChecked = Element.IsToggled;
diff --git a/Ooui/Element.cs b/Ooui/Element.cs
index ea87569..bc08de7 100644
--- a/Ooui/Element.cs
+++ b/Ooui/Element.cs
@@ -25,12 +25,12 @@ namespace Ooui
             set => SetProperty (ref hidden, value, "hidden");
         }
 
-        public event TargetEventHandler Clicked {
+        public event TargetEventHandler Click {
             add => AddEventListener ("click", value);
             remove => RemoveEventListener ("click", value);
         }
 
-        public event TargetEventHandler DoubleClicked {
+        public event TargetEventHandler DoubleClick {
             add => AddEventListener ("dblclick", value);
             remove => RemoveEventListener ("dblclick", value);
         }
@@ -40,7 +40,7 @@ namespace Ooui
             remove => RemoveEventListener ("keydown", value);
         }
 
-        public event TargetEventHandler KeyPressed {
+        public event TargetEventHandler KeyPress {
             add => AddEventListener ("keypress", value);
             remove => RemoveEventListener ("keypress", value);
         }
@@ -55,17 +55,17 @@ namespace Ooui
             remove => RemoveEventListener ("mousedown", value);
         }
 
-        public event TargetEventHandler MouseEntered {
+        public event TargetEventHandler MouseEnter {
             add => AddEventListener ("mouseenter", value);
             remove => RemoveEventListener ("mouseenter", value);
         }
 
-        public event TargetEventHandler MouseLeft {
+        public event TargetEventHandler MouseLeave {
             add => AddEventListener ("mouseleave", value);
             remove => RemoveEventListener ("mouseleave", value);
         }
 
-        public event TargetEventHandler MouseMoved {
+        public event TargetEventHandler MouseMove {
             add => AddEventListener ("mousemove", value);
             remove => RemoveEventListener ("mousemove", value);
         }
@@ -85,7 +85,7 @@ namespace Ooui
             remove => RemoveEventListener ("mouseup", value);
         }
 
-        public event TargetEventHandler Wheeled {
+        public event TargetEventHandler Wheel {
             add => AddEventListener ("wheel", value);
             remove => RemoveEventListener ("wheel", value);
         }
diff --git a/Ooui/Form.cs b/Ooui/Form.cs
index e23e22a..809397a 100644
--- a/Ooui/Form.cs
+++ b/Ooui/Form.cs
@@ -22,7 +22,7 @@ namespace Ooui
 			set => SetProperty (ref enctype, value ?? "", "enctype");
 		}
 
-		public event TargetEventHandler Submitted {
+		public event TargetEventHandler Submit {
             add => AddEventListener ("submit", value);
             remove => RemoveEventListener ("submit", value);
         }
diff --git a/Ooui/Input.cs b/Ooui/Input.cs
index 1ceaa9d..90f73d8 100644
--- a/Ooui/Input.cs
+++ b/Ooui/Input.cs
@@ -30,16 +30,11 @@ namespace Ooui
             }
         }
 
-        public event TargetEventHandler Changed {
+        public event TargetEventHandler Change {
             add => AddEventListener ("change", value);
             remove => RemoveEventListener ("change", value);
         }
 
-        public event TargetEventHandler Inputted {
-            add => AddEventListener ("input", value);
-            remove => RemoveEventListener ("input", value);
-        }
-
         string placeholder = "";
         public string Placeholder {
             get => placeholder;
@@ -77,7 +72,7 @@ namespace Ooui
             : base ("input")
         {
             // Subscribe to the change event so we always get up-to-date values
-            Changed += (s, e) => {};
+            Change += (s, e) => {};
         }
 
         public Input (InputType type)
diff --git a/Ooui/Select.cs b/Ooui/Select.cs
index 30a7b64..c88eed4 100644
--- a/Ooui/Select.cs
+++ b/Ooui/Select.cs
@@ -10,12 +10,12 @@ namespace Ooui
             set => SetProperty (ref val, value ?? "", "value");
         }
 
-        public event TargetEventHandler Changed {
+        public event TargetEventHandler Change {
             add => AddEventListener ("change", value);
             remove => RemoveEventListener ("change", value);
         }
 
-        public event TargetEventHandler Inputted {
+        public event TargetEventHandler Input {
             add => AddEventListener ("input", value);
             remove => RemoveEventListener ("input", value);
         }
@@ -24,7 +24,7 @@ namespace Ooui
             : base ("select")
         {
             // Subscribe to the change event so we always get up-to-date values
-            Changed += (s, e) => { };
+            Change += (s, e) => { };
         }
 
         public void AddOption (string label, string value)
diff --git a/Ooui/TextArea.cs b/Ooui/TextArea.cs
index 76b3a1d..a35b962 100644
--- a/Ooui/TextArea.cs
+++ b/Ooui/TextArea.cs
@@ -4,12 +4,12 @@ namespace Ooui
 {
     public class TextArea : FormControl
     {
-        public event TargetEventHandler Changed {
+        public event TargetEventHandler Change {
             add => AddEventListener ("change", value);
             remove => RemoveEventListener ("change", value);
         }
 
-        public event TargetEventHandler Inputted {
+        public event TargetEventHandler Input {
             add => AddEventListener ("input", value);
             remove => RemoveEventListener ("input", value);
         }
@@ -36,7 +36,7 @@ namespace Ooui
             : base ("textarea")
         {
             // Subscribe to the change event so we always get up-to-date values
-            Changed += (s, e) => {};
+            Change += (s, e) => {};
         }
 
         public TextArea (string text)
diff --git a/Ooui/TextInput.cs b/Ooui/TextInput.cs
new file mode 100644
index 0000000..a8fd587
--- /dev/null
+++ b/Ooui/TextInput.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Ooui
+{
+    public class TextInput : Input
+    {
+        public event TargetEventHandler Input {
+            add => AddEventListener ("input", value);
+            remove => RemoveEventListener ("input", value);
+        }
+
+        public TextInput ()
+            : base (InputType.Text)
+        {
+        }
+    }
+}
diff --git a/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs b/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
index cf4aa7a..fa0d1a3 100644
--- a/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
+++ b/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
@@ -21,7 +21,7 @@ namespace AspNetCoreMvc.Controllers
             var head = new Heading { Text = "Click away!" };
             var label = new Label { Text = "0" };
             var btn = new Button { Text = "Increase" };
-            btn.Clicked += (sender, e) => {
+            btn.Click += (sender, e) => {
                 count++;
                 label.Text = count.ToString ();
             };
diff --git a/README.md b/README.md
index 8c5d907..7dbe022 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ class Program
 
         // Add some logic to it
         var count = 0;
-        button.Clicked += (s, e) => {
+        button.Click += (s, e) => {
             count++;
             button.Text = $"Clicked {count} times";
         };
@@ -81,7 +81,7 @@ Button MakeButton()
 {
     var button = new Button("Click me!");
     var count = 0;
-    button.Clicked += (s, e) => {
+    button.Click += (s, e) => {
         count++;
         button.Text = $"Clicked {count} times";
     };
diff --git a/Samples/ButtonSample.cs b/Samples/ButtonSample.cs
index 7d8a08f..44d99d2 100644
--- a/Samples/ButtonSample.cs
+++ b/Samples/ButtonSample.cs
@@ -14,7 +14,7 @@ namespace Samples
             };
             button.Style.MarginTop = "2em";
             var count = 0;
-            button.Clicked += (s, e) => {
+            button.Click += (s, e) => {
                 count++;
                 button.Text = $"Clicked {count} times";
             };
diff --git a/Samples/DrawSample.cs b/Samples/DrawSample.cs
index 2fe12b9..3b333de 100644
--- a/Samples/DrawSample.cs
+++ b/Samples/DrawSample.cs
@@ -27,7 +27,7 @@ namespace Samples
             };
             var context = canvas.GetContext2D ();
 
-            canvas.Clicked += (s, e) => {
+            canvas.Click += (s, e) => {
                 var radius = 10;
                 context.BeginPath ();
                 if (toolSel.Value == "box") {
@@ -47,7 +47,7 @@ namespace Samples
                 Type = ButtonType.Submit,
                 ClassName = "btn btn-danger",
             };
-            clearbtn.Clicked += (s, e) => {
+            clearbtn.Click += (s, e) => {
                 context.ClearRect (0, 0, canvas.Width, canvas.Height);
             };
             clearbtn.Style.Display = "block";
diff --git a/Samples/TodoSample.cs b/Samples/TodoSample.cs
index 839c8ab..6cf0e9c 100644
--- a/Samples/TodoSample.cs
+++ b/Samples/TodoSample.cs
@@ -66,19 +66,19 @@ namespace Samples
                 if (string.IsNullOrWhiteSpace (input.Value))
                     return;
                 var item = new Item (input.Value);
-                item.Clicked += (s, e) => {
+                item.Click += (s, e) => {
                     item.IsDone = !item.IsDone;
                 };
                 items.InsertBefore (item, items.FirstChild);
                 input.Value = "";
             }
-            addbtn.Clicked += (s, e) => {
+            addbtn.Click += (s, e) => {
                 AddItem ();
             };
-            inputForm.Submitted += (s, e) => {
+            inputForm.Submit += (s, e) => {
                 AddItem ();
             };
-            clearbtn.Clicked += (s, e) => {
+            clearbtn.Click += (s, e) => {
                 var toremove = new List<Node> ();
                 foreach (Item i in items.Children) {
                     if (i.IsDone) toremove.Add (i);
diff --git a/Tests/ButtonTests.cs b/Tests/ButtonTests.cs
index e0e3eed..7d18e22 100644
--- a/Tests/ButtonTests.cs
+++ b/Tests/ButtonTests.cs
@@ -42,7 +42,7 @@ namespace Tests
                 listened = listened || (m.MessageType == MessageType.Listen);
             };
             Assert.IsFalse (listened);
-            b.Clicked += (s, e) => {
+            b.Click += (s, e) => {
                 clicked = true;
             };
             Assert.IsTrue (listened);
diff --git a/Tests/NodeTests.cs b/Tests/NodeTests.cs
index 24eb223..20a480a 100644
--- a/Tests/NodeTests.cs
+++ b/Tests/NodeTests.cs
@@ -52,7 +52,7 @@ namespace Tests
             var b = new Button ();
             p.AppendChild (b);
             var clicked = false;
-            b.Clicked += (s, e) => {
+            b.Click += (s, e) => {
                 clicked = true;
             };
             p.Receive (Message.Event (b.Id, "click"));

From 4573596464e64e0b4e6f127a6638ec6f38cf1282 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 17:51:05 -0800
Subject: [PATCH 28/36] Implement ImageRenderer (fixes #44)

---
 Ooui.AspNetCore/OouiMiddlewareExtensions.cs |  20 +-
 Ooui.Forms/Exports.cs                       |  13 ++
 Ooui.Forms/Forms.cs                         |   2 +-
 Ooui.Forms/Renderers/ImageRenderer.cs       | 201 ++++++++++++++++++++
 Ooui/UI.cs                                  |  88 ++++++++-
 5 files changed, 312 insertions(+), 12 deletions(-)
 create mode 100644 Ooui.Forms/Renderers/ImageRenderer.cs

diff --git a/Ooui.AspNetCore/OouiMiddlewareExtensions.cs b/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
index 0d78459..d07f8e9 100644
--- a/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
+++ b/Ooui.AspNetCore/OouiMiddlewareExtensions.cs
@@ -25,10 +25,13 @@ namespace Microsoft.AspNetCore.Builder
             };
             app.UseWebSockets (webSocketOptions);
 
+            Ooui.UI.ServerEnabled = false;
+
             app.Use (async (context, next) =>
             {
+                var response = context.Response;
+
                 if (context.Request.Path == jsPath) {
-                    var response = context.Response;
                     var clientJsBytes = Ooui.UI.ClientJsBytes;
                     var clientJsEtag = Ooui.UI.ClientJsEtag;
                     if (context.Request.Headers.TryGetValue ("If-None-Match", out var inms) && inms.Count > 0 && inms[0] == clientJsEtag) {
@@ -53,6 +56,21 @@ namespace Microsoft.AspNetCore.Builder
                         context.Response.StatusCode = 400;
                     }
                 }
+                else if (Ooui.UI.TryGetFileContentAtPath (context.Request.Path, out var file)) {
+                    if (context.Request.Headers.TryGetValue ("If-None-Match", out var inms) && inms.Count > 0 && inms[0] == file.Etag) {
+                        response.StatusCode = 304;
+                    }
+                    else {
+                        response.StatusCode = 200;
+                        response.ContentLength = file.Content.Length;
+                        response.ContentType = file.ContentType;
+                        response.Headers.Add ("Cache-Control", "public, max-age=60");
+                        response.Headers.Add ("Etag", file.Etag);
+                        using (var s = response.Body) {
+                            await s.WriteAsync (file.Content, 0, file.Content.Length).ConfigureAwait (false);
+                        }
+                    }
+                }
                 else {
                     await next ().ConfigureAwait (false);
                 }
diff --git a/Ooui.Forms/Exports.cs b/Ooui.Forms/Exports.cs
index a467bf5..b093983 100644
--- a/Ooui.Forms/Exports.cs
+++ b/Ooui.Forms/Exports.cs
@@ -12,9 +12,13 @@ using Xamarin.Forms.Internals;
 [assembly: ExportRenderer (typeof (Editor), typeof (EditorRenderer))]
 [assembly: ExportRenderer (typeof (Entry), typeof (EntryRenderer))]
 [assembly: ExportRenderer (typeof (Frame), typeof (FrameRenderer))]
+[assembly: ExportRenderer (typeof (Image), typeof (ImageRenderer))]
 [assembly: ExportRenderer (typeof (Label), typeof (LabelRenderer))]
 [assembly: ExportRenderer (typeof (ProgressBar), typeof (ProgressBarRenderer))]
 [assembly: ExportRenderer (typeof (Switch), typeof (SwitchRenderer))]
+[assembly: ExportImageSourceHandler (typeof (FileImageSource), typeof (FileImageSourceHandler))]
+[assembly: ExportImageSourceHandler (typeof (StreamImageSource), typeof (StreamImagesourceHandler))]
+[assembly: ExportImageSourceHandler (typeof (UriImageSource), typeof (ImageLoaderSourceHandler))]
 
 namespace Ooui.Forms
 {
@@ -26,4 +30,13 @@ namespace Ooui.Forms
         {
         }
     }
+
+    [AttributeUsage (AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class ExportImageSourceHandlerAttribute : HandlerAttribute
+    {
+        public ExportImageSourceHandlerAttribute (Type handler, Type target)
+            : base (handler, target)
+        {
+        }
+    }
 }
diff --git a/Ooui.Forms/Forms.cs b/Ooui.Forms/Forms.cs
index 991c264..0922ded 100644
--- a/Ooui.Forms/Forms.cs
+++ b/Ooui.Forms/Forms.cs
@@ -31,7 +31,7 @@ namespace Xamarin.Forms
             Registrar.RegisterAll (new[] {
                 typeof(ExportRendererAttribute),
                 //typeof(ExportCellAttribute),
-                //typeof(ExportImageSourceHandlerAttribute),
+                typeof(ExportImageSourceHandlerAttribute),
             });
         }
 
diff --git a/Ooui.Forms/Renderers/ImageRenderer.cs b/Ooui.Forms/Renderers/ImageRenderer.cs
new file mode 100644
index 0000000..d955c47
--- /dev/null
+++ b/Ooui.Forms/Renderers/ImageRenderer.cs
@@ -0,0 +1,201 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace Ooui.Forms.Renderers
+{
+    public class ImageRenderer : ViewRenderer<Xamarin.Forms.Image, Ooui.Image>
+    {
+        bool _isDisposed;
+
+        protected override void Dispose (bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing) {
+            }
+
+            _isDisposed = true;
+
+            base.Dispose (disposing);
+        }
+
+        protected override async void OnElementChanged (ElementChangedEventArgs<Xamarin.Forms.Image> e)
+        {
+            if (Control == null) {
+                var imageView = new Ooui.Image ();
+                SetNativeControl (imageView);
+            }
+
+            if (e.NewElement != null) {
+                SetAspect ();
+                await TrySetImage (e.OldElement);
+                SetOpacity ();
+            }
+
+            base.OnElementChanged (e);
+        }
+
+        protected override async void OnElementPropertyChanged (object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged (sender, e);
+            if (e.PropertyName == Xamarin.Forms.Image.SourceProperty.PropertyName)
+                await TrySetImage ();
+            else if (e.PropertyName == Xamarin.Forms.Image.IsOpaqueProperty.PropertyName)
+                SetOpacity ();
+            else if (e.PropertyName == Xamarin.Forms.Image.AspectProperty.PropertyName)
+                SetAspect ();
+        }
+
+        void SetAspect ()
+        {
+            if (_isDisposed || Element == null || Control == null) {
+                return;
+            }
+        }
+
+        protected virtual async Task TrySetImage (Xamarin.Forms.Image previous = null)
+        {
+            // By default we'll just catch and log any exceptions thrown by SetImage so they don't bring down
+            // the application; a custom renderer can override this method and handle exceptions from
+            // SetImage differently if it wants to
+
+            try {
+                await SetImage (previous).ConfigureAwait (false);
+            }
+            catch (Exception ex) {
+                System.Diagnostics.Debug.WriteLine ("Error loading image: {0}", ex);
+            }
+            finally {
+                ((IImageController)Element)?.SetIsLoading (false);
+            }
+        }
+
+        protected async Task SetImage (Xamarin.Forms.Image oldElement = null)
+        {
+            if (_isDisposed || Element == null || Control == null) {
+                return;
+            }
+
+            var source = Element.Source;
+
+            if (oldElement != null) {
+                var oldSource = oldElement.Source;
+                if (Equals (oldSource, source))
+                    return;
+
+                if (oldSource is FileImageSource && source is FileImageSource && ((FileImageSource)oldSource).File == ((FileImageSource)source).File)
+                    return;
+
+                Control.Source = "";
+            }
+
+            IImageSourceHandler handler;
+
+            Element.SetIsLoading (true);
+
+            if (source != null &&
+                (handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandler<IImageSourceHandler> (source.GetType ())) != null) {
+                string uiimage;
+                try {
+                    uiimage = await handler.LoadImageAsync (source, scale: 1.0f);
+                }
+                catch (OperationCanceledException) {
+                    uiimage = null;
+                }
+
+                if (_isDisposed)
+                    return;
+
+                var imageView = Control;
+                if (imageView != null)
+                    imageView.Source = uiimage;
+
+                ((IVisualElementController)Element).NativeSizeChanged ();
+            }
+            else {
+                Control.Source = "";
+            }
+
+            Element.SetIsLoading (false);
+        }
+
+        void SetOpacity ()
+        {
+            if (_isDisposed || Element == null || Control == null) {
+                return;
+            }
+        }
+    }
+
+    public interface IImageSourceHandler : IRegisterable
+    {
+        Task<string> LoadImageAsync (ImageSource imagesource, CancellationToken cancelationToken = default (CancellationToken), float scale = 1);
+    }
+
+    public sealed class FileImageSourceHandler : IImageSourceHandler
+    {
+        public async Task<string> LoadImageAsync (ImageSource imagesource, CancellationToken cancelationToken = default (CancellationToken), float scale = 1f)
+        {
+            string image = null;
+            var filesource = imagesource as FileImageSource;
+            var file = filesource?.File;
+            if (!string.IsNullOrEmpty (file)) {
+                var name = System.IO.Path.GetFileName (file);
+                image = "/images/" + name;
+                if (Ooui.UI.TryGetFileContentAtPath (image, out var f)) {
+                    // Already published
+                }
+                else {
+                    await Task.Run (() => Ooui.UI.PublishFile (image, file), cancelationToken);
+                }
+            }
+            return image;
+        }
+    }
+
+    public sealed class StreamImagesourceHandler : IImageSourceHandler
+    {
+        public async Task<string> LoadImageAsync (ImageSource imagesource, CancellationToken cancelationToken = default (CancellationToken), float scale = 1f)
+        {
+            string image = null;
+            var streamsource = imagesource as StreamImageSource;
+            if (streamsource?.Stream != null) {
+                using (var streamImage = await ((IStreamImageSource)streamsource).GetStreamAsync (cancelationToken).ConfigureAwait (false)) {
+                    if (streamImage != null) {
+                        var data = new byte[streamImage.Length];
+                        using (var outputStream = new System.IO.MemoryStream (data)) {
+                            await streamImage.CopyToAsync (outputStream, 4096, cancelationToken).ConfigureAwait (false);
+                        }
+                        var hash = Ooui.UI.Hash (data);
+                        var etag = "\"" + hash + "\"";
+                        image = "/images/" + hash;
+                        if (Ooui.UI.TryGetFileContentAtPath (image, out var file) && file.Etag == etag) {
+                            // Already published
+                        }
+                        else {
+                            Ooui.UI.PublishFile (image, data, etag, "image");
+                        }
+                    }
+                }
+            }
+
+            if (image == null) {
+                System.Diagnostics.Debug.WriteLine ("Could not load image: {0}", streamsource);
+            }
+            return image;
+        }
+    }
+
+    public sealed class ImageLoaderSourceHandler : IImageSourceHandler
+    {
+        public Task<string> LoadImageAsync (ImageSource imagesource, CancellationToken cancelationToken = default (CancellationToken), float scale = 1f)
+        {
+            var imageLoader = imagesource as UriImageSource;
+            return Task.FromResult (imageLoader?.Uri.ToString () ?? "");
+        }
+    }
+}
diff --git a/Ooui/UI.cs b/Ooui/UI.cs
index aa0f75e..33c39ac 100644
--- a/Ooui/UI.cs
+++ b/Ooui/UI.cs
@@ -73,6 +73,19 @@ namespace Ooui
                 }
             }
         }
+        static bool serverEnabled = true;
+        public static bool ServerEnabled {
+            get => serverEnabled;
+            set {
+                if (serverEnabled != value) {
+                    serverEnabled = value;
+                    if (serverEnabled)
+                        Restart ();
+                    else
+                        Stop ();
+                }
+            }
+        }
 
         static UI ()
         {
@@ -91,7 +104,7 @@ namespace Ooui
             clientJsEtag = "\"" + Hash (clientJsBytes) + "\"";
         }
 
-        static string Hash (byte[] bytes)
+        public static string Hash (byte[] bytes)
         {
             var sha = sha256;
             if (sha == null) {
@@ -135,7 +148,47 @@ namespace Ooui
             if (contentType == null) {
                 contentType = GuessContentType (path, filePath);
             }
-            Publish (path, new DataHandler (data, contentType));
+            var etag = "\"" + Hash (data) + "\"";
+            Publish (path, new DataHandler (data, etag, contentType));
+        }
+
+        public static void PublishFile (string path, byte[] data, string contentType)
+        {
+            var etag = "\"" + Hash (data) + "\"";
+            Publish (path, new DataHandler (data, etag, contentType));
+        }
+
+        public static void PublishFile (string path, byte[] data, string etag, string contentType)
+        {            
+            Publish (path, new DataHandler (data, etag, contentType));
+        }
+
+        public static bool TryGetFileContentAtPath (string path, out FileContent file)
+        {
+            RequestHandler handler;
+            lock (publishedPaths) {
+                if (!publishedPaths.TryGetValue (path, out handler)) {
+                    file = null;
+                    return false;
+                }
+            }
+            if (handler is DataHandler dh) {
+                file = new FileContent {
+                    Etag = dh.Etag,
+                    Content = dh.Data,
+                    ContentType = dh.ContentType,
+                };
+                return true;
+            }
+            file = null;
+            return false;
+        }
+
+        public class FileContent
+        {
+            public string ContentType { get; set; }
+            public string Etag { get; set; }
+            public byte[] Content { get; set; }
         }
 
         public static void PublishJson (string path, Func<object> ctor)
@@ -146,7 +199,8 @@ namespace Ooui
         public static void PublishJson (string path, object value)
         {
             var data = JsonHandler.GetData (value);
-            Publish (path, new DataHandler (data, JsonHandler.ContentType));
+            var etag = "\"" + Hash (data) + "\"";
+            Publish (path, new DataHandler (data, etag, JsonHandler.ContentType));
         }
 
 		public static void PublishCustomResponse (string path, Action<HttpListenerContext, CancellationToken> responder)
@@ -178,6 +232,7 @@ namespace Ooui
 
         static void Start ()
         {
+            if (!serverEnabled) return;
             if (serverCts != null) return;
             serverCts = new CancellationTokenSource ();
             var token = serverCts.Token;
@@ -343,11 +398,17 @@ namespace Ooui
         class DataHandler : RequestHandler
         {
             readonly byte[] data;
+            readonly string etag;
             readonly string contentType;
 
-            public DataHandler (byte[] data, string contentType = null)
+            public byte[] Data => data;
+            public string Etag => etag;
+            public string ContentType => contentType;
+
+            public DataHandler (byte[] data, string etag, string contentType = null)
             {
                 this.data = data;
+                this.etag = etag;
                 this.contentType = contentType;
             }
 
@@ -357,13 +418,20 @@ namespace Ooui
                 var path = url.LocalPath;
                 var response = listenerContext.Response;
 
-                response.StatusCode = 200;
-                if (!string.IsNullOrEmpty (contentType))
-                    response.ContentType = contentType;
-                response.ContentLength64 = data.LongLength;
+                var inm = listenerContext.Request.Headers.Get ("If-None-Match");
+                if (!string.IsNullOrEmpty (inm) && inm == etag) {
+                    response.StatusCode = 304;
+                }
+                else {
+                    response.StatusCode = 200;
+                    response.AddHeader ("Etag", etag);
+                    if (!string.IsNullOrEmpty (contentType))
+                        response.ContentType = contentType;
+                    response.ContentLength64 = data.LongLength;
 
-                using (var s = response.OutputStream) {
-                    s.Write (data, 0, data.Length);
+                    using (var s = response.OutputStream) {
+                        s.Write (data, 0, data.Length);
+                    }
                 }
                 response.Close ();
             }

From 2f0adaea7abef61dae53068cf35eb61b206eef8c Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 17:53:36 -0800
Subject: [PATCH 29/36] Set tint to Bootsrap blue

---
 Ooui.Forms/Forms.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ooui.Forms/Forms.cs b/Ooui.Forms/Forms.cs
index 0922ded..94bc20e 100644
--- a/Ooui.Forms/Forms.cs
+++ b/Ooui.Forms/Forms.cs
@@ -26,7 +26,7 @@ namespace Xamarin.Forms
             Device.SetIdiom (TargetIdiom.Desktop);
             Device.PlatformServices = new OouiPlatformServices ();
             Device.Info = new OouiDeviceInfo ();
-            Color.SetAccent (Color.FromHex ("#0000EE")); // Safari Blue
+            Color.SetAccent (Color.FromHex ("#337ab7")); // Bootstrap Blue
 
             Registrar.RegisterAll (new[] {
                 typeof(ExportRendererAttribute),

From 23d5f1df77cafb4431d8fc6049e429a98b2138b6 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 18:07:13 -0800
Subject: [PATCH 30/36] Make ImageRenderer clip its contents

---
 Ooui.Forms/Renderers/ImageRenderer.cs | 1 +
 Ooui/Style.cs                         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Ooui.Forms/Renderers/ImageRenderer.cs b/Ooui.Forms/Renderers/ImageRenderer.cs
index d955c47..3f9e6e2 100644
--- a/Ooui.Forms/Renderers/ImageRenderer.cs
+++ b/Ooui.Forms/Renderers/ImageRenderer.cs
@@ -28,6 +28,7 @@ namespace Ooui.Forms.Renderers
             if (Control == null) {
                 var imageView = new Ooui.Image ();
                 SetNativeControl (imageView);
+                this.Style.Overflow = "hidden";
             }
 
             if (e.NewElement != null) {
diff --git a/Ooui/Style.cs b/Ooui/Style.cs
index 4163f75..6a6f307 100644
--- a/Ooui/Style.cs
+++ b/Ooui/Style.cs
@@ -253,6 +253,11 @@ namespace Ooui
             set => this["order"] = value;
         }
 
+        public Value Overflow {
+            get => this["overflow"];
+            set => this["overflow"] = value;
+        }
+
         public Value PaddingTop {
             get => this["padding-top"];
             set => this["padding-top"] = value;

From 6e05c2677b70b5f6f5a8a236604b783fc734acad Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 19:02:41 -0800
Subject: [PATCH 31/36] Update Forms page sizes (fixes #35)

---
 Ooui.Forms/PlatformRenderer.cs | 14 ++++++++++++++
 Ooui/Client.js                 |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Ooui.Forms/PlatformRenderer.cs b/Ooui.Forms/PlatformRenderer.cs
index d555803..922d171 100644
--- a/Ooui.Forms/PlatformRenderer.cs
+++ b/Ooui.Forms/PlatformRenderer.cs
@@ -15,5 +15,19 @@ namespace Ooui.Forms
 		{
 			this.platform = platform;
 		}
+
+        protected override bool TriggerEventFromMessage (Message message)
+        {
+            if (message.TargetId == "window" && message.Key == "resize" && message.Value is Newtonsoft.Json.Linq.JObject j) {
+                var width = (double)j["width"];
+                var height = (double)j["height"];
+                Platform.Element.Style.Width = width;
+                Platform.Element.Style.Height = height;
+                return true;
+            }
+            else {
+                return base.TriggerEventFromMessage (message);
+            }
+        }
 	}
 }
diff --git a/Ooui/Client.js b/Ooui/Client.js
index faac03a..605cb91 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -100,8 +100,8 @@ function ooui (rootElementPath) {
         function resizeHandler() {
             const em = {
                 m: "event",
-                id: 42,
-                k: "window.resize",
+                id: "window",
+                k: "resize",
                 v: getSize (),
             };
             const ems = JSON.stringify (em);

From 0598645923709859ceaed3d6103e2fe443da6f75 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 19:10:02 -0800
Subject: [PATCH 32/36] Don't force reload the page on error (fixes #24)

---
 Ooui/Client.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Ooui/Client.js b/Ooui/Client.js
index 605cb91..f77d6e1 100644
--- a/Ooui/Client.js
+++ b/Ooui/Client.js
@@ -57,7 +57,8 @@ function ooui (rootElementPath) {
     socket.addEventListener ("close", function (event) {
         console.error ("Web socket close", event);
         if (opened) {
-            location.reload ();
+            alert ("Connection to the server has been lost. Please try refreshing the page.");
+            opened = false;
         }
     });
 

From 9d50826c1886c1abbebb953044ff85f369998b17 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 20:17:35 -0800
Subject: [PATCH 33/36] Improve the XAML Editor

---
 Samples/XamlPreviewPage.xaml    |  9 +++++++--
 Samples/XamlPreviewPage.xaml.cs | 12 ++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Samples/XamlPreviewPage.xaml b/Samples/XamlPreviewPage.xaml
index 93adffc..a96fa29 100644
--- a/Samples/XamlPreviewPage.xaml
+++ b/Samples/XamlPreviewPage.xaml
@@ -3,6 +3,7 @@
 	<ContentPage.Content>
         <Grid>
             <Grid.RowDefinitions>
+                <RowDefinition Height="auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -10,8 +11,12 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <Editor x:Name="editor" FontFamily="monospace" Grid.Row="0" Grid.Column="0" />
-            <ContentView x:Name="results" Grid.Row="0" Grid.Column="1" BackgroundColor="White" />
+            <StackLayout Orientation="Vertical" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                <Label Text="Xamarin.Forms XAML Editor" FontSize="24" FontAttributes="Bold" Margin="8,8,8,0" />
+                <Label Text="Edit the XAML below to see a live preview on the right" Margin="8,0,8,8" />
+            </StackLayout>
+            <Editor x:Name="editor" FontFamily="monospace" FontSize="12" Grid.Row="1" Grid.Column="0" />
+            <ContentView x:Name="results" Grid.Row="1" Grid.Column="1" BackgroundColor="White" />
         </Grid>
 	</ContentPage.Content>
 </ContentPage>
diff --git a/Samples/XamlPreviewPage.xaml.cs b/Samples/XamlPreviewPage.xaml.cs
index 08462bd..9059a88 100644
--- a/Samples/XamlPreviewPage.xaml.cs
+++ b/Samples/XamlPreviewPage.xaml.cs
@@ -23,10 +23,14 @@ namespace Samples
     <ColumnDefinition Width=""*"" />
     <ColumnDefinition Width=""*"" />
   </Grid.ColumnDefinitions>
-  <Label Text=""Top Left"" Grid.Row=""0"" Grid.Column=""0"" />
-  <Label Text=""Top Right"" Grid.Row=""0"" Grid.Column=""1"" />
-  <Label Text=""Bottom Left"" Grid.Row=""1"" Grid.Column=""0"" />
-  <Label Text=""Bottom Right"" Grid.Row=""1"" Grid.Column=""1"" />
+  <StackLayout Grid.Row=""0"" Grid.Column=""0"">
+    <Label Text=""Top Left"" />
+    <Entry Placeholder=""I'm ready for some text"" />
+    <Button Text=""I'm a button, but I don't do anything"" />
+  </StackLayout>
+  <Label Text=""Top Right"" Grid.Row=""0"" Grid.Column=""1"" TextColor=""White"" BackgroundColor=""#c5000b"" />
+  <Label Text=""Bottom Left"" Grid.Row=""1"" Grid.Column=""0"" TextColor=""Black"" BackgroundColor=""#ffd320"" />
+  <Label Text=""Bottom Right"" Grid.Row=""1"" Grid.Column=""1"" TextColor=""White"" BackgroundColor=""#008000"" />
 </Grid>
 </ContentView>";
             editor.TextChanged += (sender, e) => DisplayXaml ();

From a211e8d4f8dd39129053360f91e89b202f77e548 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 20:23:19 -0800
Subject: [PATCH 34/36] Fix measuring empty Entry heights

---
 Ooui.Forms/Renderers/EntryRenderer.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Ooui.Forms/Renderers/EntryRenderer.cs b/Ooui.Forms/Renderers/EntryRenderer.cs
index 63a8750..6457a17 100644
--- a/Ooui.Forms/Renderers/EntryRenderer.cs
+++ b/Ooui.Forms/Renderers/EntryRenderer.cs
@@ -17,7 +17,17 @@ namespace Ooui.Forms.Renderers
 
         public override SizeRequest GetDesiredSize (double widthConstraint, double heightConstraint)
         {
-            var size = Element.Text.MeasureSize (Element.FontFamily, Element.FontSize, Element.FontAttributes);
+            var text = Element.Text;
+            if (text == null || text.Length == 0) {
+                text = Element.Placeholder;
+            }
+            Size size;
+            if (text == null || text.Length == 0) {
+                size = new Size (Element.FontSize * 0.25, Element.FontSize);
+            }
+            else {
+                size = text.MeasureSize (Element.FontFamily, Element.FontSize, Element.FontAttributes);
+            }
             size = new Size (size.Width, size.Height * 1.428 + 14);
             return new SizeRequest (size, size);
         }

From f0ed625159a5bd7b0477633bd8f9e9c25abb5a01 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 20:28:05 -0800
Subject: [PATCH 35/36] Fix updating Entry values

---
 Ooui.Forms/Renderers/EntryRenderer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ooui.Forms/Renderers/EntryRenderer.cs b/Ooui.Forms/Renderers/EntryRenderer.cs
index 6457a17..4e54dbd 100644
--- a/Ooui.Forms/Renderers/EntryRenderer.cs
+++ b/Ooui.Forms/Renderers/EntryRenderer.cs
@@ -123,8 +123,8 @@ namespace Ooui.Forms.Renderers
         void OnEditingEnded (object sender, EventArgs e)
         {
             // Typing aid changes don't always raise EditingChanged event
-            if (Control.Text != Element.Text) {
-                ElementController.SetValueFromRenderer (Entry.TextProperty, Control.Text);
+            if (Control.Value != Element.Text) {
+                ElementController.SetValueFromRenderer (Entry.TextProperty, Control.Value);
             }
 
             ElementController.SetValueFromRenderer (VisualElement.IsFocusedPropertyKey, false);

From 0203e3c4b8f241f5ccf1ed21766c06f7faf5e81b Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Sun, 10 Dec 2017 20:37:16 -0800
Subject: [PATCH 36/36] Add cancellation logic to preview

---
 Samples/XamlPreviewPage.xaml.cs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Samples/XamlPreviewPage.xaml.cs b/Samples/XamlPreviewPage.xaml.cs
index 9059a88..21f9318 100644
--- a/Samples/XamlPreviewPage.xaml.cs
+++ b/Samples/XamlPreviewPage.xaml.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using System.Threading;
 using Xamarin.Forms;
 
 namespace Samples
@@ -37,19 +37,33 @@ namespace Samples
             DisplayXaml ();
         }
 
+        CancellationTokenSource lastCts = null;
+
         public void DisplayXaml ()
         {
             try {
+                var cts = new CancellationTokenSource ();
+                var token = cts.Token;
+                lastCts?.Cancel ();
+                lastCts = cts;
+
                 var asm = typeof (Xamarin.Forms.Xaml.Internals.XamlTypeResolver).Assembly;
                 var xamlLoaderType = asm.GetType ("Xamarin.Forms.Xaml.XamlLoader");
                 var loadArgTypes = new[] { typeof (object), typeof (string) };
                 var loadMethod = xamlLoaderType.GetMethod ("Load", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public, null, System.Reflection.CallingConventions.Any, loadArgTypes, null);
                 var contentView = new ContentView ();
                 loadMethod.Invoke (null, new object[] { contentView, editor.Text });
-                results.Content = contentView;
+
+                if (!token.IsCancellationRequested) {
+                    results.Content = contentView;
+                }
+            }
+            catch (OperationCanceledException) {
             }
             catch (Exception ex) {
                 results.Content = new Label {
+                    TextColor = Color.DarkRed,
+                    FontSize = 12,
                     Text = ex.ToString (),
                 };
             }