Propagate mouse events to ListWidget children (#694)

dub.json

@@ -34,8 +34,8 @@
     "dependencies": {
         "inilike": "~>1.2.2",
         "icontheme": "~>1.2.3",
-        "arsd-official:dom": "<11.0.0",
-        "arsd-official:image_files": "<11.0.0"
+        "arsd-official:dom": "~>11.5.3",
+        "arsd-official:image_files": "~>11.5.3"
     },
 
     "subPackages": [

src/dlangui/core/collections.d

@@ -42,7 +42,7 @@ module dlangui.core.collections;
 
 import std.algorithm;
 
-/** 
+/**
     Array based collection of items.
 
     Retains item order when during add/remove operations.
@@ -62,10 +62,10 @@ struct Collection(T, bool ownItems = false) {
     @property void size(size_t newSize) {
         if (_len > newSize)
             length = newSize; // shrink
-        _items.length = newSize; 
+        _items.length = newSize;
     }
     /// returns number of items in collection
-    @property void length(size_t newSize) { 
+    @property void length(size_t newSize) {
         if (newSize < _len) {
             // shrink
             static if (is(T == class) || is(T == struct)) {
@@ -248,6 +248,13 @@ struct ObjectList(T) {
         assert(index >= 0 && index < _count, "child index out of range");
         return _list[index];
     }
+    /// get item by index. Returns null if item not found
+    inout(T) tryGet(int index) @safe inout {
+        if (index < 0 || index >= _count) {
+            return null;
+        }
+        return _list[index];
+    }
     /// get item by index
     T opIndex(int index) @safe {
         return get(index);

src/dlangui/dml/tokenizer.d

@@ -101,7 +101,7 @@ class ParserException : Exception {
 /// simple tokenizer for DlangUI ML
 class Tokenizer {
 
-    protected string[] _singleLineCommentPrefixes = ["//"];
+    protected string[] _singleLineCommentPrefixes;
     protected LineStream  _lines;
     protected dchar[] _lineText;
     protected ushort _line;

src/dlangui/widgets/editors.d

@@ -415,7 +415,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
     }
 
     /// Characters at which content is split for word wrap mode
-    dchar[] splitChars = [' ', '-', '\t'];
+    immutable dchar[] splitChars = [' ', '-', '\t'];
 
     /// Divides up a string for word wrapping, sets info in _span
     dstring[] wrapLine(dstring str, int lineNumber) {
@@ -465,7 +465,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
     }
 
     /// Divide (and conquer) text into words
-    dstring[] explode(dstring str, dchar[] splitChars)
+    dstring[] explode(dstring str, const(dchar)[] splitChars)
     {
         dstring[] parts;
         int startIndex = 0;

src/dlangui/widgets/lists.d

@@ -572,7 +572,7 @@ interface OnItemClickHandler {
 }
 
 
-/** List widget - shows content as hori*/
+/** List widget - shows content as horizontal or vertical list */
 class ListWidget : WidgetGroup, OnScrollHandler, OnAdapterChangeHandler {
 
     /** Handle selection change. */
@@ -1349,7 +1349,8 @@ class ListWidget : WidgetGroup, OnScrollHandler, OnAdapterChangeHandler {
             itemrc.right += rc.left - scrollOffset.x;
             itemrc.top += rc.top - scrollOffset.y;
             itemrc.bottom += rc.top - scrollOffset.y;
-            if (itemrc.isPointInside(Point(event.x, event.y))) {
+            auto point = Point(event.x, event.y);
+            if (itemrc.isPointInside(point)) {
                 if (_adapter && _adapter.wantMouseEvents) {
                     auto itemWidget = _adapter.itemWidget(i);
                     if (itemWidget) {
@@ -1358,7 +1359,13 @@ class ListWidget : WidgetGroup, OnScrollHandler, OnAdapterChangeHandler {
                         if (event.action == MouseAction.Move && event.noModifiers && itemWidget.hasTooltip) {
                             itemWidget.scheduleTooltip(200);
                         }
-                        //itemWidget.onMouseEvent(event);
+                        foreach (j; 0 .. itemWidget.childCount) {
+                            auto child = itemWidget.child(j);
+                            if (child.isPointInside(point)) {
+                                child.onMouseEvent(event);
+                            }
+                        }
+                        itemWidget.onMouseEvent(event);
                         itemWidget.parent = oldParent;
                     }
                 }

src/dlangui/widgets/styles.d

@@ -1674,10 +1674,6 @@ bool loadTheme(Theme theme, XmlDocument doc, int level = 0) {
     foreach(styleitem; doc.root.childNodes) {
         if (styleitem.tagName.equal("style")) {
             // load <style>
-            if(styleitem.children.length > 0)
-            {
-                styleitem.innerHTML(styleitem.children[0].nodeValue, true); // HACK by adr
-            }
             string styleid = attrValue(styleitem, "id");
             string styleparent = attrValue(styleitem, "parent");
             if (styleid.length) {

src/dlangui/widgets/tree.d

@@ -279,7 +279,7 @@ class TreeItem {
     /// returns number of children of this widget
     @property int childCount() { return _children.count; }
     /// returns child by index
-    TreeItem child(int index) { return _children.get(index); }
+    TreeItem child(int index) { return _children.tryGet(index); }
     /// adds child, returns added item
     TreeItem addChild(TreeItem item, int index = -1) {
         TreeItem res = _children.insert(item, index).parent(this).level(_level + 1);

src/dlangui/widgets/widget.d

@@ -1821,7 +1821,7 @@ class WidgetGroup : Widget {
     /// returns number of children of this widget
     @property override int childCount() const { return _children.count; }
     /// returns child by index
-    override inout(Widget) child(int index) inout { return _children.get(index); }
+    override inout(Widget) child(int index) inout { return _children.tryGet(index); }
     /// adds child, returns added item
     override Widget addChild(Widget item) { return _children.add(item).parent(this); }
     /// inserts child at given index, returns inserted item