Of course it's not quite finished yet. Here are some of the important things to
+
do.
-
+
Better performance
Support of position CSS property
Support of height and min-height CSS property
diff --git a/Source/Demo/WPF/MainControl.xaml b/Source/Demo/WPF/MainControl.xaml
index 714c2dbf1..cb12b66b5 100644
--- a/Source/Demo/WPF/MainControl.xaml
+++ b/Source/Demo/WPF/MainControl.xaml
@@ -29,7 +29,10 @@
-
+
+
+
+
diff --git a/Source/Demo/WPF/MainControl.xaml.cs b/Source/Demo/WPF/MainControl.xaml.cs
index 215d3b13c..adb1919b2 100644
--- a/Source/Demo/WPF/MainControl.xaml.cs
+++ b/Source/Demo/WPF/MainControl.xaml.cs
@@ -336,6 +336,11 @@ private void OnRenderError(object sender, RoutedEvenArgs
private void OnLinkClicked(object sender, RoutedEvenArgs args)
{
+ if (args.Data.Link == "SayHellooo")
+ {
+ _htmlPanel.ScrollToElement("bottomList");
+ args.Data.Handled = true;
+ }
if (args.Data.Link == "SayHello")
{
MessageBox.Show("Hello you!");
@@ -375,5 +380,12 @@ private string GetHtmlEditorText()
}
#endregion
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ var btn = sender as Button;
+ var parent = btn.Parent;
+
+ }
}
}
\ No newline at end of file
diff --git a/Source/HtmlRenderer.WPF/HtmlContainer.cs b/Source/HtmlRenderer.WPF/HtmlContainer.cs
index 13835c4ce..6121e6ac6 100644
--- a/Source/HtmlRenderer.WPF/HtmlContainer.cs
+++ b/Source/HtmlRenderer.WPF/HtmlContainer.cs
@@ -18,6 +18,7 @@
using System.Windows.Media;
using TheArtOfDev.HtmlRenderer.Adapters.Entities;
using TheArtOfDev.HtmlRenderer.Core;
+using TheArtOfDev.HtmlRenderer.Core.Dom;
using TheArtOfDev.HtmlRenderer.Core.Entities;
using TheArtOfDev.HtmlRenderer.Core.Parse;
using TheArtOfDev.HtmlRenderer.Core.Utils;
@@ -342,6 +343,19 @@ public string GetLinkAt(Point location)
var r = _htmlContainerInt.GetElementRectangle(elementId);
return r.HasValue ? Utils.Convert(r.Value) : (Rect?)null;
}
+ ///
+ /// Get the Rect of html element as calculated by html layout.
+ /// Element if found by id (id attribute on the html element).
+ /// Note: to get the screen Rect you need to adjust by the hosting control.
+ ///
+ /// the id of the element to get its Rect
+ /// the Rect of the element or null if not found
+ public Rect? GetElementRectangle(string elementId, out List elementsIds, out CssBox box)
+ {
+ elementsIds = new List();
+ var r = _htmlContainerInt.GetElementRectangle(elementId, out elementsIds, out box);
+ return r.HasValue ? Utils.Convert(r.Value) : (Rect?)null;
+ }
///
/// Measures the bounds of box and children, recursively.
diff --git a/Source/HtmlRenderer.WPF/HtmlPanel.cs b/Source/HtmlRenderer.WPF/HtmlPanel.cs
index 44fea7028..12ea43015 100644
--- a/Source/HtmlRenderer.WPF/HtmlPanel.cs
+++ b/Source/HtmlRenderer.WPF/HtmlPanel.cs
@@ -10,11 +10,15 @@
// - Sun Tsu,
// "The Art of War"
+using System;
+using System.Collections.Generic;
+using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using System.Windows.Media;
+using TheArtOfDev.HtmlRenderer.Core.Dom;
using TheArtOfDev.HtmlRenderer.Core.Entities;
using TheArtOfDev.HtmlRenderer.Core.Utils;
@@ -43,6 +47,8 @@ public class HtmlPanel : HtmlControl
///
protected ScrollBar _horizontalScrollBar;
+ public event ScrollEventHandler Scrolled;
+
#endregion
@@ -95,7 +101,68 @@ public virtual void ScrollToElement(string elementId)
}
}
}
+ ///
+ /// Adjust the scrollbar of the panel on html element by the given id.
+ /// The top of the html element rectangle will be at the top of the panel, if there
+ /// is not enough height to scroll to the top the scroll will be at maximum.
+ ///
+ /// the id of the element to scroll to
+ public virtual void ScrollToElement(string elementId, out string result, out List availableIds)
+ {
+ availableIds = new List();
+ result = "_htmlContainer is null";
+ ArgChecker.AssertArgNotNullOrEmpty(elementId, "elementId");
+ if (_htmlContainer != null)
+ {
+ result = "id not found";
+ CssBox box = null;
+ var rect = _htmlContainer.GetElementRectangle(elementId, out availableIds, out box);
+ if (rect.HasValue)
+ {
+ result = "";//Scrolled to " + rect.Value.Location.X + ":" + rect.Value.Location.Y;
+ Dispatcher.Invoke(new Action(() =>
+ {
+ ScrollToPoint(rect.Value.Location.X, Math.Max(rect.Value.Location.Y - 50, 0));
+ box.BorderLeftColor = "red";
+ box.BorderLeftStyle = "solid";
+ box.BorderLeftWidth = "2px";
+ box.PaddingLeft = "3px";
+ System.Windows.Forms.Timer t = new System.Windows.Forms.Timer();
+ t.Interval = 300;
+ this.InvalidateVisual();
+ int counter = 0;
+ t.Tick += (sen, ev) =>
+ {
+ if (counter == 6)
+ {
+ t.Stop();
+ box.BorderLeftColor = "black";
+ box.BorderLeftStyle = "none";
+ box.BorderLeftWidth = "0";
+ box.PaddingLeft = "0";
+ }
+ if (counter % 2 == 0)
+ box.BorderLeftWidth = "2px";
+ else
+ box.BorderLeftWidth = "0px";
+ this.InvalidateVisual();
+ counter++;
+ };
+ t.Start();
+ _htmlContainer.HandleMouseMove(this, Mouse.GetPosition(this));
+ }));
+ }
+ }
+ }
+ public virtual void ScrollToTop()
+ {
+ if (_htmlContainer != null)
+ {
+ ScrollToPoint(0, 0);
+ _htmlContainer.HandleMouseMove(this, Mouse.GetPosition(this));
+ }
+ }
#region Private methods
@@ -333,6 +400,15 @@ private void ScrollToPoint(double x, double y)
_verticalScrollBar.Value = y;
UpdateScrollOffsets();
}
+ ///
+ /// Set the control scroll offset to the given values.
+ ///
+ public void ScrollVertically(double p)
+ {
+ if (_verticalScrollBar.Value == p) return;
+ _verticalScrollBar.Value = p;
+ UpdateScrollOffsets();
+ }
///
/// On scrollbar scroll update the scroll offsets and invalidate.
@@ -340,6 +416,7 @@ private void ScrollToPoint(double x, double y)
private void OnScrollBarScroll(object sender, ScrollEventArgs e)
{
UpdateScrollOffsets();
+ Scrolled?.Invoke(sender, e);
}
///
@@ -350,6 +427,7 @@ private void UpdateScrollOffsets()
var newScrollOffset = new Point(-_horizontalScrollBar.Value, -_verticalScrollBar.Value);
if (!newScrollOffset.Equals(_htmlContainer.ScrollOffset))
{
+ var oldValue = _htmlContainer.ScrollOffset;
_htmlContainer.ScrollOffset = newScrollOffset;
InvalidateVisual();
}
diff --git a/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj b/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
index 5c725a851..d560295ea 100644
--- a/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
+++ b/Source/HtmlRenderer.WPF/HtmlRenderer.WPF.csproj
@@ -9,7 +9,7 @@
PropertiesTheArtOfDev.HtmlRenderer.WPFHtmlRenderer.WPF
- v3.0
+ v4.0512{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}4
@@ -36,11 +36,12 @@
+
+
-
diff --git a/Source/HtmlRenderer/Core/Dom/CssBox.cs b/Source/HtmlRenderer/Core/Dom/CssBox.cs
index edd9d6f0a..d013d7d95 100644
--- a/Source/HtmlRenderer/Core/Dom/CssBox.cs
+++ b/Source/HtmlRenderer/Core/Dom/CssBox.cs
@@ -32,7 +32,7 @@ namespace TheArtOfDev.HtmlRenderer.Core.Dom
/// To know more about boxes visit CSS spec:
/// http://www.w3.org/TR/CSS21/box.html
///
- internal class CssBox : CssBoxProperties, IDisposable
+ public class CssBox : CssBoxProperties, IDisposable
{
#region Fields and Consts
diff --git a/Source/HtmlRenderer/Core/Dom/CssBoxProperties.cs b/Source/HtmlRenderer/Core/Dom/CssBoxProperties.cs
index 3acc6ed41..3be9611f7 100644
--- a/Source/HtmlRenderer/Core/Dom/CssBoxProperties.cs
+++ b/Source/HtmlRenderer/Core/Dom/CssBoxProperties.cs
@@ -27,7 +27,7 @@ namespace TheArtOfDev.HtmlRenderer.Core.Dom
/// Has additional fields to control the location and size of the box and 'actual' css values for some properties
/// that require additional calculations and parsing.
///
- internal abstract class CssBoxProperties
+ public abstract class CssBoxProperties
{
#region CSS Fields
diff --git a/Source/HtmlRenderer/Core/Dom/HtmlTag.cs b/Source/HtmlRenderer/Core/Dom/HtmlTag.cs
index ca282fc29..58bf42ffe 100644
--- a/Source/HtmlRenderer/Core/Dom/HtmlTag.cs
+++ b/Source/HtmlRenderer/Core/Dom/HtmlTag.cs
@@ -15,7 +15,7 @@
namespace TheArtOfDev.HtmlRenderer.Core.Dom
{
- internal sealed class HtmlTag
+ public sealed class HtmlTag
{
#region Fields and Consts
diff --git a/Source/HtmlRenderer/Core/HtmlContainerInt.cs b/Source/HtmlRenderer/Core/HtmlContainerInt.cs
index e3f25cbef..99571bcfd 100644
--- a/Source/HtmlRenderer/Core/HtmlContainerInt.cs
+++ b/Source/HtmlRenderer/Core/HtmlContainerInt.cs
@@ -539,6 +539,23 @@ public string GetLinkAt(RPoint location)
var box = DomUtils.GetBoxById(_root, elementId.ToLower());
return box != null ? CommonUtils.GetFirstValueOrDefault(box.Rectangles, box.Bounds) : (RRect?)null;
}
+ ///
+ /// Get the rectangle of html element as calculated by html layout.
+ /// Element if found by id (id attribute on the html element).
+ /// Note: to get the screen rectangle you need to adjust by the hosting control.
+ ///
+ /// the id of the element to get its rectangle
+ /// the rectangle of the element or null if not found
+ public RRect? GetElementRectangle(string elementId, out List elementsIds, out CssBox box)
+ {
+ elementsIds = new List();
+ ArgChecker.AssertArgNotNullOrEmpty(elementId, "elementId");
+
+ box = DomUtils.GetBoxById(_root, elementId.ToLower(), ref elementsIds);
+
+ return box != null ? CommonUtils.GetFirstValueOrDefault(box.Rectangles, box.Bounds) : (RRect?)null;
+ }
+
///
/// Measures the bounds of box and children, recursively.
diff --git a/Source/HtmlRenderer/Core/Utils/DomUtils.cs b/Source/HtmlRenderer/Core/Utils/DomUtils.cs
index 03a1d668c..13760290c 100644
--- a/Source/HtmlRenderer/Core/Utils/DomUtils.cs
+++ b/Source/HtmlRenderer/Core/Utils/DomUtils.cs
@@ -299,7 +299,34 @@ public static CssBox GetBoxById(CssBox box, string id)
return foundBox;
}
}
+ return null;
+ }
+ ///
+ /// Get css box under the given sub-tree with the given id.
+ ///
+ /// the box to start search from
+ /// the id to find the box by
+ /// css box if exists or null
+ public static CssBox GetBoxById(CssBox box, string id, ref List elementsIds)
+ {
+ if (box != null && !string.IsNullOrEmpty(id))
+ {
+ if (box.HtmlTag != null)
+ if (!string.IsNullOrEmpty(box.HtmlTag.TryGetAttribute("id", string.Empty)))
+ elementsIds.Add(box.HtmlTag.TryGetAttribute("id"));
+ if (box.HtmlTag != null && id.Equals(box.HtmlTag.TryGetAttribute("id"), StringComparison.OrdinalIgnoreCase))
+ {
+ return box;
+ }
+
+ foreach (var childBox in box.Boxes)
+ {
+ var foundBox = GetBoxById(childBox, id, ref elementsIds);
+ if (foundBox != null)
+ return foundBox;
+ }
+ }
return null;
}
diff --git a/Source/HtmlRenderer/Core/Utils/SubString.cs b/Source/HtmlRenderer/Core/Utils/SubString.cs
index f06f740f2..298350689 100644
--- a/Source/HtmlRenderer/Core/Utils/SubString.cs
+++ b/Source/HtmlRenderer/Core/Utils/SubString.cs
@@ -17,7 +17,7 @@ namespace TheArtOfDev.HtmlRenderer.Core.Utils
///
/// Represents sub-string of a full string starting at specific location with a specific length.
///
- internal sealed class SubString
+ public sealed class SubString
{
#region Fields and Consts