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.1.0",
-        "arsd-official:image_files": "~>11.1.0"
+        "arsd-official:dom": "~>11.5.3",
+        "arsd-official:image_files": "~>11.5.3"
     },
 
     "subPackages": [
@@ -59,7 +59,7 @@
             "libs-windows": ["opengl32"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2",
+                "bindbc-freetype": "~>1.2.4",
                 "bindbc-sdl": "~>1.4.5"
             },
             "copyFiles-windows-x86_64": [
@@ -81,7 +81,7 @@
             "libs-windows": ["opengl32"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2"
+                "bindbc-freetype": "~>1.2.4"
             }
         },
         {
@@ -92,7 +92,7 @@
             "libs-windows": ["opengl32"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2",
+                "bindbc-freetype": "~>1.2.4",
                 "bindbc-sdl": "~>1.4.5",
                 "icontheme": "~>1.2.3"
             }
@@ -103,7 +103,7 @@
             "versions-windows": ["Unicode"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2",
+                "bindbc-freetype": "~>1.2.4",
                 "bindbc-sdl": "~>1.4.5",
                 "icontheme": "~>1.2.3"
             },
@@ -123,7 +123,7 @@
             "libs-posix": ["GLX"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2",
+                "bindbc-freetype": "~>1.2.4",
                 "x11": "~>1.0.21",
                 "icontheme": "~>1.2.3",
                 "glx-d": "~>1.1.0"
@@ -135,7 +135,7 @@
             "versions-windows": ["Unicode"],
             "dependencies": {
                 "bindbc-opengl": "~>1.1.0",
-                "bindbc-freetype": "~>1.2.2",
+                "bindbc-freetype": "~>1.2.4",
                 "dsfml": "~>2.1.0",
                 "icontheme": "~>1.2.3"
             },

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/core/events.d

@@ -52,13 +52,13 @@ struct Accelerator {
         version (OSX) {
             static if (true) {
                 if (keyFlags & KeyFlag.Control)
-                    buf ~= "Ctrl+";
+                    buf ~= "⌃ "; //"Ctrl+";
                 if (keyFlags & KeyFlag.Shift)
-                    buf ~= "Shift+";
+                    buf ~= "⇧ "; //"Shift+";
                 if (keyFlags & KeyFlag.Option)
-                    buf ~= "Opt+";
+                    buf ~= "⌥ "; //"Opt+";
                 if (keyFlags & KeyFlag.Command)
-                    buf ~= "Cmd+";
+                    buf ~= "⌘ "; //"Cmd+";
             } else {
                 if (keyFlags & KeyFlag.Control)
                     buf ~= "⌃";

src/dlangui/core/files.d

@@ -502,7 +502,7 @@ RootEntry[] getBookmarkPaths() nothrow
     return res;
 }
 
-/// returns true if directory is root directory (e.g. / or C:\)
+/// returns true if directory is root directory (e.g. / or C:\\)
 bool isRoot(in string path) pure nothrow {
     string root = rootName(path);
     if (path.equal(root))

src/dlangui/core/types.d

@@ -348,7 +348,7 @@ private __gshared int PRIVATE_SCREEN_DPI_OVERRIDE = 0;
     return PRIVATE_SCREEN_DPI_OVERRIDE ? PRIVATE_SCREEN_DPI_OVERRIDE : PRIVATE_SCREEN_DPI;
 }
 
-/// get screen DPI detection override value, if non 0 - this value is used instead of DPI detected by platform, if 0, value detected by platform will be used)
+/// get screen DPI detection override value, if non 0 - this value is used instead of DPI detected by platform, if 0, value detected by platform will be used
 @property int overrideScreenDPI() {
     return PRIVATE_SCREEN_DPI_OVERRIDE;
 }

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/platforms/sdl/sdlapp.d

@@ -1618,8 +1618,11 @@ bool sdlUpdateScreenDpi(int displayIndex = 0) {
     if (numDisplays < displayIndex + 1)
         return false;
     float hdpi = 0;
-    if (SDL_GetDisplayDPI(displayIndex, null, &hdpi, null))
+    float ddpi = 0;
+    float vdpi = 0;
+    if (SDL_GetDisplayDPI(displayIndex, &ddpi, &hdpi, &vdpi))
         return false;
+    Log.d("SDL_GetDisplayDPI(", displayIndex, ") : ddpi=", ddpi, " hdpi=", hdpi, " vdpi=", vdpi);
     int idpi = cast(int)hdpi;
     if (idpi < 32 || idpi > 2000)
         return false;
@@ -1690,9 +1693,10 @@ int sdlmain(string[] args) {
 
     Platform.setInstance(sdl);
 
+    sdlUpdateScreenDpi(0);
+
     currentTheme = createDefaultTheme();
 
-    sdlUpdateScreenDpi(0);
 
     Platform.instance.uiTheme = "theme_default";
 

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

views/DLANGUI_VERSION

@@ -1 +1 @@
-v0.9.182
+v0.10.7

views/res/theme_default.xml

@@ -178,16 +178,20 @@
         >
     </style>
     <style id="TAB_DOWN_BUTTON_DARK"
-        padding="5,1,1,1"
+        padding="2pt,1pt,2pt,1pt"
         backgroundImageId="tab_btn_dark_down"
         />
+    <style id="TAB_DOWN_BUTTON"
+        padding="2pt,1pt,2pt,1pt"
+        backgroundImageId="tab_btn_down"
+        />
     <style id="TAB_UP_DARK"
         backgroundImageId="dock_window_caption_background"
         layoutWidth="FILL_PARENT"
         >
     </style>
     <style id="TAB_UP_BUTTON_DARK"
-        padding="5,1,1,1"
+        padding="2pt,1pt,2pt,1pt"
         backgroundImageId="tab_btn_dark_up"
         >
         <length id="overlap" value="2"/>
@@ -215,6 +219,7 @@
         <state state_hovered="true" textColor="#0000C0"/>
     </style>
     <style id="TAB_UP_BUTTON"
+        padding="2pt,1pt,2pt,1pt"
         backgroundImageId="tab_btn_up"
         />
     <style id="TAB_HOST"
@@ -232,49 +237,49 @@
 	layoutWeight="0"
         />
     <style id="MAIN_MENU_ITEM"
-        padding="4,2,4,2"
+        padding="3pt,2pt,3pt,2pt"
         backgroundImageId="main_menu_item_background"
         textFlags="Parent"
         />
     <style id="MENU_ITEM"
         backgroundImageId="menu_item_background"
-        padding="4pt,2pt,4pt,2pt"
+        padding="3pt,2pt,3pt,2pt"
         >
     </style>
     <style id="MENU_SEPARATOR"
         backgroundImageId="menu_separator"
-        padding="4pt,2pt,4pt,2pt"
+        padding="3pt,2pt,3pt,2pt"
         >
     </style>
     <style id="MENU_ICON"
-        margins="2,2,2,2"
+        margins="2pt,2pt,2pt,2pt"
         align="Left|VCenter"
         >
         <state state_enabled="false" alpha="160"/>
     </style>
     <style id="MENU_LABEL"
-        margins="4,2,4,2"
+        margins="2pt,1pt,2pt,1pt"
         align="Left|VCenter"
         textFlags="UnderlineHotKeys"
         >
         <state state_enabled="false" textColor="#80404040"/>
     </style>
     <style id="MAIN_MENU_LABEL"
-        margins="4,2,4,2"
+        margins="2pt,1pt,2pt,1pt"
         align="Left|VCenter"
         textFlags="Parent"
         >
         <state state_enabled="false" textColor="#80404040"/>
     </style>
     <style id="MENU_ACCEL"
-        margins="4,2,4,2"
+        margins="2pt,1pt,2pt,1pt"
         align="Left|VCenter"
         >
         <state state_enabled="false" textColor="#80404040"/>
     </style>
     <style id="TRANSPARENT_BUTTON_BACKGROUND"
         backgroundImageId="btn_background_transparent"
-        padding="4,2,4,2"
+        padding="2pt,1pt,2pt,1pt"
         />
     <style id="POPUP_MENU"
         backgroundImageId="popup_menu_background_normal"
@@ -285,33 +290,33 @@
 
     <style id="COMBO_BOX"
         backgroundImageId="combobox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="40"
         />
     <style id="COMBO_BOX_BODY"
-        padding="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
         minWidth="40"
         align="Left|VCenter"
 	focusRectColors="#000"
         />
     <style id="COMBO_BOX_BUTTON"
-        padding="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
         backgroundImageId="btn_background_transparent"
         align="Center"
         />
 
     <style id="EDIT_LINE"
         backgroundImageId="editbox_background"
-        padding="4,4,4,4"
-        margins="2,2,2,2"
+        padding="3pt,3pt,3pt,3pt"
+        margins="1pt,1pt,1pt,1pt"
         minWidth="40"
         />
     <style id="EDIT_BOX"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -322,8 +327,8 @@
         fontSize="9pt"
         fontFamily="MonoSpace"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -331,16 +336,16 @@
         />
     <style id="LIST_BOX"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         />
     <style id="EDIT_BOX_NO_FRAME"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundColor="#FFFFFF"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -348,8 +353,8 @@
         />
     <style id="STRING_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -357,8 +362,8 @@
         />
     <style id="FILE_DIALOG_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -368,20 +373,20 @@
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
 	layoutWeight="0"
         />
     <style id="DOCK_HOST"
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
         />
     <style id="DOCK_HOST_BODY"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         padding="0,0,0,0"
-        margins="3,3,3,3"
+        margins="3pt,3pt,3pt,3pt"
         />
     <style id="DOCK_WINDOW"
         backgroundImageId="dock_window_background"
@@ -394,20 +399,20 @@
         backgroundImageId="popup_window_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="1,1,1,1"
-        margins="4,4,4,4"
+        padding="1pt,1pt,1pt,1pt"
+        margins="4pt,4pt,4pt,4pt"
         />
     <style id="DOCK_WINDOW_CAPTION"
         backgroundImageId="dock_window_caption_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="DOCK_WINDOW_CAPTION_LABEL"
         textColor="#000000"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="3,3,3,3"
+        padding="3pt,3pt,3pt,3pt"
         align="Left|VCenter"
         />
     <style id="DOCK_WINDOW_BODY"
@@ -420,35 +425,35 @@
         backgroundImageId="toolbar_host_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="TOOLTIP"
         backgroundImageId="tooltip_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,7,2,1"
-        padding="3,3,3,3"
+        margins="2pt,5pt,2pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
 	textColor="#404040"
         />
     <style id="TOOLBAR"
         backgroundImageId="toolbar_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,1,2,1"
+        margins="2pt,1pt,2pt,1pt"
         />
     <style id="TOOLBAR_BUTTON"
         backgroundImageId="toolbar_button_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="toolbar_button_null"/>
     </style>
     <style id="TOOLBAR_CONTROL"
         backgroundImageId="toolbar_control_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="@null"/>
     </style>
@@ -486,20 +491,20 @@
     </style>
 
     <style id="SETTINGS_TREE"
-        margins="8,8,8,8"
+        margins="5pt,5pt,5pt,5pt"
         backgroundColor="#FFFFFF"
         layoutWeight="3"
     />
 
     <style id="SETTINGS_PAGES"
-        margins="0,8,8,8"
-        padding="4,4,4,4"
+        margins="0,8pt,8pt,8pt"
+        padding="4pt,4pt,4pt,4pt"
         layoutWidth="FILL_PARENT"
         layoutWeight="5"
     />
 
     <style id="SETTINGS_PAGE_TITLE"
-        margins="4,4,4,14"
+        margins="4pt,4pt,4pt,10pt"
 	fontSize="120%"
 	layoutWeight="0"
         layoutWidth="FILL_PARENT"
@@ -508,8 +513,8 @@
     <style id="RESIZER_VERTICAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minHeight="7"
-	maxHeight="7"
+	minHeight="7pt"
+	maxHeight="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>
@@ -519,8 +524,8 @@
     <style id="RESIZER_HORIZONTAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minWidth="7"
-	maxWidth="7"
+	minWidth="7pt"
+	maxWidth="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>

views/standard_resources.list

@@ -20,8 +20,8 @@ res/btn_radio.xml
 res/btn_radio_dark.xml
 res/btn_radio_background.xml
 res/btn_radio_background_dark.xml
-res/close.png
-res/close_dark.png
+res/mdpi/close.png
+res/mdpi/close_dark.png
 res/combobox_background.xml
 res/combobox_background_dark.xml
 res/editbox_background.xml
@@ -74,6 +74,8 @@ res/main_menu_item_background_normal.9.png
 res/main_menu_item_background_normal_dark.9.png
 res/main_menu_item_background_selected.9.png
 res/main_menu_item_background_selected_dark.9.png
+res/hdpi/hdpi_close.png
+res/hdpi/hdpi_close_dark.png
 res/hdpi/hdpi_applications-internet.png
 res/hdpi/hdpi_arrow_right_down_black.png
 res/hdpi/hdpi_arrow_right_down_black_dark.png
@@ -129,6 +131,10 @@ res/hdpi/hdpi_switch_off.png
 res/hdpi/hdpi_switch_off_disabled.png
 res/hdpi/hdpi_switch_on.png
 res/hdpi/hdpi_switch_on_disabled.png
+res/hdpi/hdpi_scrollbar_indicator_horizontal.png
+res/hdpi/hdpi_scrollbar_indicator_vertical.png
+res/hdpi/hdpi_find_case_sensitive.png
+res/hdpi/hdpi_find_whole_words.png
 res/mdpi/applications-internet.png
 res/mdpi/arrow_right_down_black.png
 res/mdpi/arrow_right_down_black_dark.png