From 88a288c6b2cd3cfe4c385e148ada6f1c3a4a7fed Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 1 Dec 2014 12:29:34 +0300
Subject: [PATCH] Tree widget, continue development

---
 examples/example1/src/main.d        |   9 ++
 res/mdpi/arrow_right_down_black.png | Bin 0 -> 160 bytes
 res/mdpi/arrow_right_hollow.png     | Bin 0 -> 2873 bytes
 src/dlangui/widgets/tree.d          | 153 +++++++++++++++++++++++++---
 src/dlangui/widgets/widget.d        |  10 +-
 5 files changed, 155 insertions(+), 17 deletions(-)
 create mode 100644 res/mdpi/arrow_right_down_black.png
 create mode 100644 res/mdpi/arrow_right_hollow.png

diff --git a/examples/example1/src/main.d b/examples/example1/src/main.d
index 68701bf5..7a2f8852 100644
--- a/examples/example1/src/main.d
+++ b/examples/example1/src/main.d
@@ -623,6 +623,15 @@ extern (C) int UIAppMain(string[] args) {
         // tree view example
 		TreeWidget tree = new TreeWidget("TREE1");
 		tree.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
+        TreeItem tree1 = tree.items.newChild("group1", "Group 1"d);
+        tree1.newChild("g1_1", "Group 1 item 1"d);
+        tree1.newChild("g1_2", "Group 1 item 2"d);
+        tree1.newChild("g1_3", "Group 1 item 3"d);
+        TreeItem tree2 = tree.items.newChild("group2", "Group 2"d);
+        tree2.newChild("g2_1", "Group 2 item 1"d);
+        tree2.newChild("g2_2", "Group 2 item 2"d);
+        tree2.newChild("g2_3", "Group 2 item 3"d);
+        tree2.newChild("g2_4", "Group 2 item 4"d);
 		tabs.addTab(tree, "Tree"d);
 
 
diff --git a/res/mdpi/arrow_right_down_black.png b/res/mdpi/arrow_right_down_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e92bd81fdf4bd128e748c77ff7d5460b6542f8
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&Y)RhkE({YvFz?TiQ$P{U0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQhmoCE(D|?ELZFbYr;B5V#`&w4Hu5qUa2znOd;jvC
yprpXfy{XTF);q9j1vGMnEMO8{;lO%p{vYO+NjCN;O<#cAz~JfX=d#Wzp$PzFqASJ#

literal 0
HcmV?d00001

diff --git a/res/mdpi/arrow_right_hollow.png b/res/mdpi/arrow_right_hollow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c0aab510e6a5424df2c88c1edf7f80d9056110c
GIT binary patch
literal 2873
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
XJzb%;#+M^H00000NkvXXu0mjf``~fj

literal 0
HcmV?d00001

diff --git a/src/dlangui/widgets/tree.d b/src/dlangui/widgets/tree.d
index 31107e34..527504b2 100644
--- a/src/dlangui/widgets/tree.d
+++ b/src/dlangui/widgets/tree.d
@@ -3,6 +3,7 @@ module dlangui.widgets.tree;
 import dlangui.widgets.widget;
 import dlangui.widgets.controls;
 import dlangui.widgets.scroll;
+import dlangui.widgets.layouts;
 import std.conv;
 import std.algorithm;
 
@@ -16,6 +17,36 @@ class TreeItem {
     protected ObjectList!TreeItem _children;
     protected bool _expanded;
 
+    this(string id) {
+        _id = id;
+        _expanded = true;
+    }
+    this(string id, dstring label, string iconRes = null) {
+        _id = id;
+        _expanded = true;
+        _iconRes = iconRes;
+        _text = label;
+    }
+    this(string id, UIString label, string iconRes = null) {
+        _id = id;
+        _expanded = true;
+        _iconRes = iconRes;
+        _text = label;
+    }
+    this(string id, string labelRes, string iconRes = null) {
+        _id = id;
+        _expanded = true;
+        _iconRes = iconRes;
+        _text = labelRes;
+    }
+    /// create and add new child item
+    TreeItem newChild(string id, dstring label, string iconRes = null) {
+        TreeItem res = new TreeItem(id, label, iconRes);
+        addChild(res);
+        return res;
+    }
+
+
     @property TreeItem parent() { return _parent; }
     @property protected TreeItem parent(TreeItem p) { _parent = p; return this; }
     @property string id() { return _id; }
@@ -31,11 +62,16 @@ class TreeItem {
     }
     @property bool expanded() { return _expanded; }
     @property protected TreeItem expanded(bool expanded) { _expanded = expanded; return this; }
+    /** Returns true if this item and all parents are expanded. */
     bool isFullyExpanded() {
         if (!_expanded)
             return false;
+        return isVisible();
+    }
+    /** Returns true if all parents are expanded. */
+    bool isVisible() {
         if (_parent)
-            return _parent.isFullyExpanded();
+            return _parent.isVisible();
         return false;
     }
     void expand() {
@@ -72,6 +108,9 @@ class TreeItem {
         return _parent.topParent;
     }
 
+    /// returns true if item has at least one child
+    @property bool hasChildren() { return childCount > 0; }
+
     /// returns number of children of this widget
     @property int childCount() { return _children.count; }
     /// returns child by index
@@ -100,7 +139,11 @@ class TreeItem {
     }
     /// returns index of widget in child list, -1 if passed widget is not a child of this widget
     int childIndex(TreeItem item) { return _children.indexOf(item); }
-
+    /// notify listeners
+    protected void onUpdate(TreeItem item) {
+        if (_parent)
+            _parent.onUpdate(item);
+    }
 }
 
 interface OnTreeContentChangeListener {
@@ -109,36 +152,114 @@ interface OnTreeContentChangeListener {
 
 class TreeItems : TreeItem {
     // signal handler OnTreeContentChangeListener
-    Listener!OnTreeContentChangeListener listener;
+    Signal!OnTreeContentChangeListener listener;
+
+    this() {
+        super("tree");
+    }
+
+    /// notify listeners
+    override protected void onUpdate(TreeItem item) {
+        if (listener.assigned)
+            listener(this);
+    }
 }
 
-class TreeWidgetBase :  ScrollWidgetBase {
+class TreeItemWidget : HorizontalLayout {
+    TreeItem _item;
+    TextWidget _tab;
+    ImageWidget _expander;
+    ImageWidget _icon;
+    TextWidget _label;
+    this(TreeItem item) {
+        super(item.id);
+        _item = item;
+        _tab = new TextWidget("tab");
+        dchar[] tabText;
+        dchar[] singleTab = [' ', ' ', ' ', ' '];
+        for (int i = 1; i < _item.level; i++)
+            tabText ~= singleTab;
+        _tab.text = cast(dstring)tabText;
+        _expander = new ImageWidget("expander", _item.hasChildren && _item.expanded ? "arrow_right_down_black" : "arrow_right_hollow");
+        if (!_item.hasChildren)
+            _expander.visibility = Visibility.Gone;
+        if (_item.iconRes.length > 0)
+            _icon = new ImageWidget("icon", _item.iconRes);
+        _label = new TextWidget("label", _item.text);
+        addChild(_tab);
+        addChild(_expander);
+        if (_icon)
+            addChild(_icon);
+        addChild(_label);
+    }
+}
+
+class TreeWidgetBase :  ScrollWidget, OnTreeContentChangeListener {
+
+    protected TreeItems _tree;
+
+    @property ref TreeItems items() { return _tree; }
+
+    protected bool _needUpdateWidgets;
 
 	this(string ID = null, ScrollBarMode hscrollbarMode = ScrollBarMode.Visible, ScrollBarMode vscrollbarMode = ScrollBarMode.Visible) {
 		super(ID, hscrollbarMode, vscrollbarMode);
+        contentWidget = new VerticalLayout("TREE_CONTENT");
+        _tree = new TreeItems();
+        _tree.listener.connect(this);
+        _needUpdateWidgets = true;
     }
 
-    /// process horizontal scrollbar event
-    override bool onHScroll(ScrollEvent event) {
-        return true;
+    ~this() {
+        if (_tree) {
+            destroy(_tree);
+            _tree = null;
+        }
     }
 
-    /// process vertical scrollbar event
-    override bool onVScroll(ScrollEvent event) {
-        return true;
+    /** Override to use custom tree item widgets. */
+    protected Widget createItemWidget(TreeItem item) {
+        return new TreeItemWidget(item);
     }
 
-    /// update horizontal scrollbar widget position
-    override protected void updateHScrollBar() {
-        // override it
+    protected void addWidgets(TreeItem item) {
+        if (item.level > 0)
+            _contentWidget.addChild(createItemWidget(item));
+        for (int i = 0; i < item.childCount; i++)
+            addWidgets(item.child(i));
     }
 
-    /// update verticat scrollbar widget position
-    override protected void updateVScrollBar() {
-        // override it
+    protected void updateWidgets() {
+        _contentWidget.removeAllChildren();
+        addWidgets(_tree);
+        _needUpdateWidgets = false;
     }
 
+	/// Set widget rectangle to specified value and layout widget contents. (Step 2 of two phase layout).
+	override void layout(Rect rc) {
+		if (visibility == Visibility.Gone) {
+			return;
+		}
+        if (_needUpdateWidgets)
+            updateWidgets();
+        super.layout(rc);
+    }
 
+	/// Measure widget according to desired width and height constraints. (Step 1 of two phase layout).
+	override void measure(int parentWidth, int parentHeight) { 
+        if (visibility == Visibility.Gone) {
+            return;
+        }
+        if (_needUpdateWidgets)
+            updateWidgets();
+        super.measure(parentWidth, parentHeight);
+    }
+
+    /// listener
+    override void onTreeContentChange(TreeItems source) {
+        _needUpdateWidgets = true;
+        requestLayout();
+    }
 }
 
 class TreeWidget :  TreeWidgetBase {
diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d
index 49bb6857..b61cf896 100644
--- a/src/dlangui/widgets/widget.d
+++ b/src/dlangui/widgets/widget.d
@@ -1207,7 +1207,10 @@ class Widget {
     /// sets window (to be used for top level widget from Window implementation). TODO: hide it from API?
     @property void window(Window window) { _window = window; }
 
-	
+    void removeAllChildren() {
+        // override
+    }
+
 }
 
 /// object list holder, owning its objects - on destroy of holder, all own objects will be destroyed
@@ -1316,4 +1319,9 @@ class WidgetGroup : Widget {
     }
     /// returns index of widget in child list, -1 if passed widget is not a child of this widget
     override int childIndex(Widget item) { return _children.indexOf(item); }
+
+    override void removeAllChildren() {
+        _children.clear();
+    }
+
 }