Re-enable fading links when associated devices are hidden; tweak canv…

…as object appearance.
libmapper · Mar 3, 2019 · dd4d445 · dd4d445
1 parent c698acb
commit dd4d445
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/js/views/CanvasView.js b/js/views/CanvasView.js
@@ -81,8 +81,8 @@ class CanvasView extends View {
                 // snap to sig object
                 let src = self.draggingFrom.position;
                 let dst = sig.position;
-                let src_offset = src.width * 0.5 + 10;
-                let dst_offset = dst.width * 0.5 + 10;
+                let src_offset = src.width * 0.5;
+                let dst_offset = dst.width * 0.5;
                 let path = null;
                 if (self.dragging == 'left') {
                    path = [['M', src.left - src_offset, src.top],
@@ -251,7 +251,8 @@ class CanvasView extends View {
             sig.view.stop();
         sig.view.animate(attrs, duration, '>');
         if (!sig.view.label) {
-            let key = (sig.direction == 'input') ? '• ' + sig.key : sig.key + ' •';
+            // TODO: use canvasObject appearance to indicate signal direction
+            let key = sig.key;
             sig.view.label = this.canvas.text(sig.position.left, sig.position.top, key);
             sig.view.label.node.setAttribute('pointer-events', 'none');
         }

diff --git a/js/views/ChordView.js b/js/views/ChordView.js
@@ -291,10 +291,10 @@ class ChordView extends View {
                          ['A', r, r, angleInc,
                           fuzzyEq(angleInc, 6.283, 0.01) ? 1 : 0, 1,
                           pstop.x, pstop.y]];
-        let color = Raphael.hsl(dev.hue, 1, 0.5);
+        let color = Raphael.hsl(dev.hue, dev.hidden ? 0 : 1, 0.5);
         dev.view.attr({'stroke-linecap': 'butt'})
                 .animate({'path': dev.view.path,
-                          'stroke': dev.hidden ? "gray" : color,
+                          'stroke': color,
                           'fill-opacity': 0,
                           'stroke-opacity': 1,
                           'stroke-width': 40,
@@ -498,13 +498,10 @@ class ChordView extends View {
         if (midAngleDeg < 0)
             midAngleDeg += 360;
 
-        let srcColor = 'hsla(' + src.hue + ',1,0.5,0.75)';
-        let dstColor = 'hsla(' + dst.hue + ',1,0.5,0.75)';
+        let srcColor = 'hsla(' + src.hue + ','+(src.hidden ? 0 : 1)+',0.5,0.75)';
+        let dstColor = 'hsla(' + dst.hue + ','+(dst.hidden ? 0 : 1)+',0.5,0.75)';
         let fillString = midAngleDeg+'-'+srcColor+'-'+dstColor;
 
-//        if (self.draggingFrom)
-//            cx = self.mapPane.cx;
-
         let path = [];
         if (src == dst) {
             if (angleInc > 1.1) {