- Updated HtmlRenderer to the latest version

WojciechKrysiak · WojciechKrysiak · commit 23e141a990a3 · 2018-07-23T21:47:41.000+02:00
-  Implemented bitmap loading
- Implemented texture brush creation
- Implemented HtmlControl event dispatching
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/Avalonia.HtmlRenderer/external"]
 	path = external
-	url = https://github.com/AvaloniaUI/HTML-Renderer.git
-	branch = perspex-pcl
+	url = https://github.com/ArthurHub/HTML-Renderer.git
+	branch = master
diff --git a/Adapters/AvaloniaAdapter.cs b/Adapters/AvaloniaAdapter.cs
@@ -96,8 +96,7 @@ protected override RImage ConvertImageInt(object image)
 
         protected override RImage ImageFromStreamInt(Stream memoryStream)
         {
-            //TODO: Implement bitmap loader
-            return null;
+            return new ImageAdapter(new Bitmap(memoryStream));
         }
 
         protected override RFont CreateFontInt(string family, double size, RFontStyle style)
diff --git a/Adapters/GraphicsAdapter.cs b/Adapters/GraphicsAdapter.cs
@@ -189,17 +189,12 @@ public override void DrawString(string str, RFont font, RColor color, RPoint poi
 
         public override RBrush GetTextureBrush(RImage image, RRect dstRect, RPoint translateTransformLocation)
         {
-            //TODO: Implement texture brush
-            return AvaloniaAdapter.Instance.GetSolidBrush(Util.Convert(Colors.Magenta));
-
-            //var brush = new ImageBrush(((ImageAdapter)image).Image);
-            //brush.Stretch = Stretch.None;
-            //brush.TileMode = TileMode.Tile;
-            //brush.Viewport = Utils.Convert(dstRect);
-            //brush.ViewportUnits = BrushMappingMode.Absolute;
-            //brush.Transform = new TranslateTransform(translateTransformLocation.X, translateTransformLocation.Y);
-            //brush.Freeze();
-            //return new BrushAdapter(brush);
+            var brush = new ImageBrush(((ImageAdapter)image).Image);
+            brush.Stretch = Stretch.None;
+            brush.TileMode = TileMode.Tile;
+            brush.DestinationRect = new RelativeRect(Util.Convert(dstRect).Translate(Util.Convert(translateTransformLocation) - new Point()), RelativeUnit.Absolute);
+
+            return new BrushAdapter(brush);
         }
         
         public override RGraphicsPath GetGraphicsPath()
diff --git a/Avalonia.HtmlRenderer.csproj b/Avalonia.HtmlRenderer.csproj
@@ -7,8 +7,8 @@
     <NoWarn>CS0436</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageError.png" />
-    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageLoad.png" />
+    <EmbeddedResource Include="external\Source\HtmlRenderer\Core\Utils\ImageError.png" />
+    <EmbeddedResource Include="external\Source\HtmlRenderer\Core\Utils\ImageLoad.png" />
   </ItemGroup>
     <ItemGroup>
     <Compile Include="Adapters\BrushAdapter.cs" />
@@ -24,7 +24,6 @@
     <Compile Include="Compat\Api.cs" />
     <Compile Include="Compat\Attributes.cs" />
     <Compile Include="Compat\ThreadPool.cs" />
-    <Compile Include="external\Source\HtmlRenderer.Pcl\PclCompat.cs" />
     <Compile Include="external\Source\HtmlRenderer\Adapters\Entities\RColor.cs" />
     <Compile Include="external\Source\HtmlRenderer\Adapters\Entities\RDashStyle.cs" />
     <Compile Include="external\Source\HtmlRenderer\Adapters\Entities\RFontStyle.cs" />
diff --git a/HtmlControl.cs b/HtmlControl.cs
@@ -116,6 +116,7 @@ public static readonly RoutedEvent ImageLoadEvent
         static HtmlControl()
         {
             FocusableProperty.OverrideDefaultValue(typeof(HtmlControl), true);
+            AffectsRender(TextProperty);
         }
 
         /// <summary>
@@ -124,12 +125,12 @@ static HtmlControl()
         protected HtmlControl()
         {
             _htmlContainer = new HtmlContainer();
-            _htmlContainer.LoadComplete += (_, e) => OnLoadComplete(e);
-            _htmlContainer.LinkClicked += (_, e) => OnLinkClicked(e);
-            _htmlContainer.RenderError += (_, e) => OnRenderError(e);
-            _htmlContainer.Refresh += (_, e) => OnRefresh(e);
-            _htmlContainer.StylesheetLoad += (_, e) => OnStylesheetLoad(e);
-            _htmlContainer.ImageLoad += (_, e) => OnImageLoad(e);
+            _htmlContainer.LoadComplete += OnLoadComplete;
+            _htmlContainer.LinkClicked += OnLinkClicked;
+            _htmlContainer.RenderError += OnRenderError;
+            _htmlContainer.Refresh += OnRefresh;
+            _htmlContainer.StylesheetLoad += OnStylesheetLoad;
+            _htmlContainer.ImageLoad += OnImageLoad;
         }
 
         //Hack for adapter
@@ -434,6 +435,7 @@ protected override void OnMouseDoubleClick(MouseButtonEventArgs e)
                 _htmlContainer.HandleMouseDoubleClick(this, e);
         }
         */
+
         /// <summary>
         /// Handle key down event for selection, copy and scrollbars handling.
         /// </summary>
@@ -560,15 +562,13 @@ private static void OnAvaloniaProperty_valueChanged(AvaloniaObject AvaloniaObjec
         }
 
 
-        //TODO: Implement CheckAccess calls
-        /*
         private void OnLoadComplete(object sender, EventArgs e)
         {
 
             if (CheckAccess())
                 OnLoadComplete(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnLoadComplete(e)).Wait();
 
         }
 
@@ -577,40 +577,39 @@ private void OnLinkClicked(object sender, HtmlLinkClickedEventArgs e)
             if (CheckAccess())
                 OnLinkClicked(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnLinkClicked(e)).Wait();
         }
 
         private void OnRenderError(object sender, HtmlRenderErrorEventArgs e)
         {
             if (CheckAccess())
                 OnRenderError(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlRenderErrorEventArgs>(OnRenderError), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnRenderError(e)).Wait();
         }
 
         private void OnStylesheetLoad(object sender, HtmlStylesheetLoadEventArgs e)
         {
             if (CheckAccess())
                 OnStylesheetLoad(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlStylesheetLoadEventArgs>(OnStylesheetLoad), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnStylesheetLoad(e)).Wait();
         }
 
         private void OnImageLoad(object sender, HtmlImageLoadEventArgs e)
         {
             if (CheckAccess())
                 OnImageLoad(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlImageLoadEventArgs>(OnImageLoad), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnImageLoad(e)).Wait();
         }
 
         private void OnRefresh(object sender, HtmlRefreshEventArgs e)
         {
             if (CheckAccess())
                 OnRefresh(e);
             else
-                Dispatcher.UIThread.Invoke(new Action<HtmlRefreshEventArgs>(OnRefresh), e);
+                Dispatcher.UIThread.InvokeAsync(() => OnRefresh(e)).Wait();
         }
-        */
     }
 }
diff --git a/external b/external
@@ -1 +1 @@
-Subproject commit 43df78f4d1bb09d05021f062cb15e939e3e1771d
+Subproject commit 4b5b0eea8ef079e5ae27a64e3705f8c5bc8055e1

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,7 @@ protected override RImage ConvertImageInt(object image)`
`96`	`96`
`97`	`97`	`protected override RImage ImageFromStreamInt(Stream memoryStream)`
`98`	`98`	`{`
`99`		`- //TODO: Implement bitmap loader`
`100`		`- return null;`
	`99`	`+ return new ImageAdapter(new Bitmap(memoryStream));`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`protected override RFont CreateFontInt(string family, double size, RFontStyle style)`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ public static readonly RoutedEvent ImageLoadEvent`
`116`	`116`	`static HtmlControl()`
`117`	`117`	`{`
`118`	`118`	`FocusableProperty.OverrideDefaultValue(typeof(HtmlControl), true);`
	`119`	`+ AffectsRender(TextProperty);`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`/// <summary>`
`@@ -124,12 +125,12 @@ static HtmlControl()`
`124`	`125`	`protected HtmlControl()`
`125`	`126`	`{`
`126`	`127`	`_htmlContainer = new HtmlContainer();`
`127`		`- _htmlContainer.LoadComplete += (_, e) => OnLoadComplete(e);`
`128`		`- _htmlContainer.LinkClicked += (_, e) => OnLinkClicked(e);`
`129`		`- _htmlContainer.RenderError += (_, e) => OnRenderError(e);`
`130`		`- _htmlContainer.Refresh += (_, e) => OnRefresh(e);`
`131`		`- _htmlContainer.StylesheetLoad += (_, e) => OnStylesheetLoad(e);`
`132`		`- _htmlContainer.ImageLoad += (_, e) => OnImageLoad(e);`
	`128`	`+ _htmlContainer.LoadComplete += OnLoadComplete;`
	`129`	`+ _htmlContainer.LinkClicked += OnLinkClicked;`
	`130`	`+ _htmlContainer.RenderError += OnRenderError;`
	`131`	`+ _htmlContainer.Refresh += OnRefresh;`
	`132`	`+ _htmlContainer.StylesheetLoad += OnStylesheetLoad;`
	`133`	`+ _htmlContainer.ImageLoad += OnImageLoad;`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`//Hack for adapter`
`@@ -434,6 +435,7 @@ protected override void OnMouseDoubleClick(MouseButtonEventArgs e)`
`434`	`435`	`_htmlContainer.HandleMouseDoubleClick(this, e);`
`435`	`436`	`}`
`436`	`437`	`*/`
	`438`	`+`
`437`	`439`	`/// <summary>`
`438`	`440`	`/// Handle key down event for selection, copy and scrollbars handling.`
`439`	`441`	`/// </summary>`
`@@ -560,15 +562,13 @@ private static void OnAvaloniaProperty_valueChanged(AvaloniaObject AvaloniaObjec`
`560`	`562`	`}`
`561`	`563`
`562`	`564`
`563`		`- //TODO: Implement CheckAccess calls`
`564`		`- /*`
`565`	`565`	`private void OnLoadComplete(object sender, EventArgs e)`
`566`	`566`	`{`
`567`	`567`
`568`	`568`	`if (CheckAccess())`
`569`	`569`	`OnLoadComplete(e);`
`570`	`570`	`else`
`571`		`- Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);`
	`571`	`+ Dispatcher.UIThread.InvokeAsync(() => OnLoadComplete(e)).Wait();`
`572`	`572`
`573`	`573`	`}`
`574`	`574`
`@@ -577,40 +577,39 @@ private void OnLinkClicked(object sender, HtmlLinkClickedEventArgs e)`
`577`	`577`	`if (CheckAccess())`
`578`	`578`	`OnLinkClicked(e);`
`579`	`579`	`else`
`580`		`- Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);`
	`580`	`+ Dispatcher.UIThread.InvokeAsync(() => OnLinkClicked(e)).Wait();`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`private void OnRenderError(object sender, HtmlRenderErrorEventArgs e)`
`584`	`584`	`{`
`585`	`585`	`if (CheckAccess())`
`586`	`586`	`OnRenderError(e);`
`587`	`587`	`else`
`588`		`- Dispatcher.UIThread.Invoke(new Action<HtmlRenderErrorEventArgs>(OnRenderError), e);`
	`588`	`+ Dispatcher.UIThread.InvokeAsync(() => OnRenderError(e)).Wait();`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`private void OnStylesheetLoad(object sender, HtmlStylesheetLoadEventArgs e)`
`592`	`592`	`{`
`593`	`593`	`if (CheckAccess())`
`594`	`594`	`OnStylesheetLoad(e);`
`595`	`595`	`else`
`596`		`- Dispatcher.UIThread.Invoke(new Action<HtmlStylesheetLoadEventArgs>(OnStylesheetLoad), e);`
	`596`	`+ Dispatcher.UIThread.InvokeAsync(() => OnStylesheetLoad(e)).Wait();`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`private void OnImageLoad(object sender, HtmlImageLoadEventArgs e)`
`600`	`600`	`{`
`601`	`601`	`if (CheckAccess())`
`602`	`602`	`OnImageLoad(e);`
`603`	`603`	`else`
`604`		`- Dispatcher.UIThread.Invoke(new Action<HtmlImageLoadEventArgs>(OnImageLoad), e);`
	`604`	`+ Dispatcher.UIThread.InvokeAsync(() => OnImageLoad(e)).Wait();`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`private void OnRefresh(object sender, HtmlRefreshEventArgs e)`
`608`	`608`	`{`
`609`	`609`	`if (CheckAccess())`
`610`	`610`	`OnRefresh(e);`
`611`	`611`	`else`
`612`		`- Dispatcher.UIThread.Invoke(new Action<HtmlRefreshEventArgs>(OnRefresh), e);`
	`612`	`+ Dispatcher.UIThread.InvokeAsync(() => OnRefresh(e)).Wait();`
`613`	`613`	`}`
`614`		`- */`
`615`	`614`	`}`
`616`	`615`	`}`