NOTE; add unique id to default control names, fix #16, see issue for …

…discussion
snowkit · Sep 6, 2016 · 1f6a58e · 1f6a58e
1 parent 28dbfa8
commit 1f6a58e
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 14 deletions.
diff --git a/mint/Button.hx b/mint/Button.hx
@@ -32,7 +32,7 @@ class Button extends Control {
 
         options = _options;
 
-        def(options.name, 'button');
+        def(options.name, 'button.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         super(options);

diff --git a/mint/Checkbox.hx b/mint/Checkbox.hx
@@ -43,7 +43,7 @@ class Checkbox extends Control {
 
         options = _options;
 
-        def(options.name, 'checkbox');
+        def(options.name, 'checkbox.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         super(_options);

diff --git a/mint/Control.hx b/mint/Control.hx
@@ -228,7 +228,7 @@ class Control {
 
         children = [];
 
-        name = def(_options_.name, 'control');
+        name = def(_options_.name, 'control.${Helper.uniqueid()}');
         user = _options_.user;
         depth_offset = def(_options_.depth, 0);
 

diff --git a/mint/Dropdown.hx b/mint/Dropdown.hx
@@ -35,7 +35,7 @@ class Dropdown extends Control {
 
         options = _options;
 
-        def(options.name, 'dropdown');
+        def(options.name, 'dropdown.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
             //create the base control

diff --git a/mint/Image.hx b/mint/Image.hx
@@ -40,7 +40,7 @@ class Image extends Control {
 
         options = _options;
 
-        def(options.name, 'image');
+        def(options.name, 'image.${Helper.uniqueid()}');
 
         super(_options);
 

diff --git a/mint/Label.hx b/mint/Label.hx
@@ -48,7 +48,7 @@ class Label extends Control {
 
         options = _options;
 
-        def(options.name, 'label');
+        def(options.name, 'label.${Helper.uniqueid()}');
 
         super(options);
 

diff --git a/mint/List.hx b/mint/List.hx
@@ -26,7 +26,7 @@ class List extends Control {
         items = [];
         options = _options;
 
-        def(options.name, 'list');
+        def(options.name, 'list.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         super(options);

diff --git a/mint/Panel.hx b/mint/Panel.hx
@@ -28,7 +28,7 @@ class Panel extends Control {
 
         options = _options;
 
-        def(options.name, 'panel');
+        def(options.name, 'panel.${Helper.uniqueid()}');
 
         super(options);
 

diff --git a/mint/Progress.hx b/mint/Progress.hx
@@ -35,7 +35,7 @@ class Progress extends Control {
 
         options = _options;
 
-        def(options.name, 'progress');
+        def(options.name, 'progress.${Helper.uniqueid()}');
 
         super(options);
 

diff --git a/mint/Scroll.hx b/mint/Scroll.hx
@@ -55,7 +55,7 @@ class Scroll extends Control {
 
         options = _options;
 
-        def(options.name, 'scroll');
+        def(options.name, 'scroll.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         units_to_scroll_h = def(options.units_to_scroll_h, 16);

diff --git a/mint/Slider.hx b/mint/Slider.hx
@@ -60,7 +60,7 @@ class Slider extends Control {
 
         options = _options;
 
-        def(options.name, 'slider');
+        def(options.name, 'slider.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         max = def(options.max, 1);

diff --git a/mint/TextEdit.hx b/mint/TextEdit.hx
@@ -68,7 +68,7 @@ class TextEdit extends Control {
 
         options = _options;
 
-        def(options.name, 'textedit');
+        def(options.name, 'textedit.${Helper.uniqueid()}');
         def(options.mouse_input, true);
         def(options.key_input, true);
 

diff --git a/mint/Window.hx b/mint/Window.hx
@@ -61,7 +61,7 @@ class Window extends Control {
         onclose = new Signal();
         oncollapse = new Signal();
 
-        def(options.name, 'window');
+        def(options.name, 'window.${Helper.uniqueid()}');
         def(options.mouse_input, true);
 
         super(options);

diff --git a/mint/types/Types.hx b/mint/types/Types.hx
@@ -216,4 +216,23 @@ class Helper {
 
     } //in_rect
 
+    static public function uniqueid(?val:Null<Int>) : String {
+
+        if(val == null) val = Std.random(0x7fffffff);
+
+        function to_char(value:Int) : String {
+            if (value > 9) {
+                var ascii = (65 + (value - 10));
+                if (ascii > 90) { ascii += 6; }
+                return String.fromCharCode(ascii);
+            } else return Std.string(value).charAt(0);
+        } //to_char
+
+        var r = Std.int(val % 62);
+        var q = Std.int(val / 62);
+        if (q > 0) return uniqueid(q) + to_char(r);
+        else return Std.string(to_char(r));
+
+    } //uniqueid
+
 } //Helper
diff --git a/tests/test_luxe/src/tests/KitchenSink.hx b/tests/test_luxe/src/tests/KitchenSink.hx
@@ -340,7 +340,6 @@ class KitchenSink extends State {
 
         new mint.Button({
             parent: canvas,
-            name: 'button2',
             x: 76, y: 52, w: 32, h: 32,
             text: 'O',
             options: { color_hover: new Color().rgb(0xf6007b) },