6 files changed, 212 insertions, 17 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 65d26bdd..5eb75613 100644
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -115,6 +115,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
             }
             else
             {
+                // TODO - Need to update border style and width also
                 el.elementModel.stroke = colorObj;
             }
 
@@ -159,10 +160,22 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
                         case 'gradient':
                             this.setProperty(el, "border-image", color.color.css);
                             this.setProperty(el, "border-color", "none");
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                             break;
                         default:
                             this.setProperty(el, "border-image", "none");
                             this.setProperty(el, "border-color", color.color.css);
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                     }
                 }
                 el.elementModel.stroke = color;
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 640119c4..8953f155 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -249,6 +249,10 @@ exports.ShapesController = Montage.create(CanvasController, {
     setColor: {
         value: function(el, color, isFill) {
             var webGl = color.webGlColor || color.color.webGlColor;
+            if(!webGl)
+            {
+                webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+            }
             if(isFill)
             {
                 el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
@@ -260,6 +264,14 @@ exports.ShapesController = Montage.create(CanvasController, {
                 el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
                 this.setShapeProperty(el, "stroke", webGl);
                 this.setShapeProperty(el, "border", color);
+                if(color.strokeInfo)
+                {
+                    var strokeWidth = this.GetValueInPixels(color.strokeInfo.strokeSize,
+                                                            color.strokeInfo.strokeUnits);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(strokeWidth);
+                    this.setShapeProperty(el, "strokeSize", color.strokeInfo.strokeSize + " "
+                                                                + color.strokeInfo.strokeUnits);
+                }
             }
             el.elementModel.shapeModel.GLWorld.render();
         }
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 795753d2..62a3eadd 100644
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
-
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     toolBase = require("js/tools/ToolBase").toolBase;
 
 exports.EyedropperTool = Montage.create(toolBase, {
@@ -99,10 +100,10 @@ exports.EyedropperTool = Montage.create(toolBase, {
             if (obj)
             {
                 // TODO - figure out if user clicked on a border - for now, just get fill
-                var c = ElementsMediator.getColor(obj, true);
+                var c = ElementsMediator.getColor(obj, this._isOverBorder(obj, event));
                 if(c)
                 {
-                    var color = this.application.ninja.colorController.getColorObjFromCss(c);
+                    var color = this.application.ninja.colorController.getColorObjFromCss(c.color.css);
                     if (color && color.value) {
                         color.value.wasSetByCode = true;
                         color.value.type = 'changing';
@@ -147,6 +148,163 @@ exports.EyedropperTool = Montage.create(toolBase, {
                 this._previousColor = color.value.css;
             }
         }
+    },
+
+    // TODO - We don't want to calculate this repeatedly
+    _isOverBorder: {
+        value: function(elt, event)
+        {
+            var border = ElementsMediator.getProperty(elt, "border", parseFloat);
+
+            if(border)
+            {
+                var bounds3D,
+                    innerBounds = [],
+                    pt = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)),
+                    bt = ElementsMediator.getProperty(elt, "border-top", parseFloat),
+                    br = ElementsMediator.getProperty(elt, "border-right", parseFloat),
+                    bb = ElementsMediator.getProperty(elt, "border-bottom", parseFloat),
+                    bl = ElementsMediator.getProperty(elt, "border-left", parseFloat);
+
+//                this.application.ninja.stage.viewUtils.setViewportObj( elt );
+                bounds3D = this.application.ninja.stage.viewUtils.getElementViewBounds3D( elt );
+                console.log("bounds");
+                console.dir(bounds3D);
+
+                var xAdj = bl || border,
+                    yAdj = bt || border;
+                innerBounds.push([bounds3D[0][0] + xAdj, bounds3D[0][1] + yAdj, 0]);
+
+                yAdj += bb || border;
+                innerBounds.push([bounds3D[1][0] + xAdj, bounds3D[1][1] - yAdj, 0]);
+
+                xAdj += br || border;
+                innerBounds.push([bounds3D[2][0] - xAdj, bounds3D[2][1] - yAdj, 0]);
+
+                yAdj = bt || border;
+                innerBounds.push([bounds3D[3][0] - xAdj, bounds3D[3][1] + yAdj, 0]);
+                console.log("innerBounds");
+                console.dir(innerBounds);
+
+                var tmpPt = this.application.ninja.stage.viewUtils.globalToLocal([pt.x, pt.y], elt);
+                var x = tmpPt[0],
+                    y = tmpPt[1];
+
+                if(x < innerBounds[0][0]) return false;
+                if(x > innerBounds[2][0]) return false;
+                if(y < innerBounds[0][1]) return false;
+                if(y > innerBounds[1][1]) return false;
+
+                return true;
+
+
+//                var contain = MathUtils.boundaryContainsPoint(innerBounds, tmpPt, false);
+//                console.log("contain is " + contain);
+//                var tmpMat = this.application.ninja.stage.viewUtils.getLocalToGlobalMatrix( elt );
+////                var zoomFactor = 1;
+////                if (this.application.ninja.stage.viewport.style && this.application.ninja.stage.viewport.style.zoom)
+////                {
+////                    zoomFactor = Number(this.application.ninja.stage.viewport.style.zoom);
+////                }
+//
+//                for (var j=0;  j<4;  j++)
+//                {
+//                    var localPt = innerBounds[j];
+//                    var tmpPt = this.application.ninja.stage.viewUtils.localToGlobal2(localPt, tmpMat);
+//
+////                    if(zoomFactor !== 1)
+////                    {
+////                        tmpPt = vecUtils.vecScale(3, tmpPt, zoomFactor);
+////                        tmpPt[0] += this.application.ninja.stage.scrollLeft*(zoomFactor - 1);
+////                        tmpPt[1] += this.application.ninja.stage.scrollTop*(zoomFactor - 1);
+////                    }
+//                    innerBounds[j]  = tmpPt;
+//                }
+//
+//                var contain = MathUtils.boundaryContainsPoint(innerBounds, [pt.x, pt.y], false);
+//                console.log("contain is " + contain);
+
+
+
+//                var bounds,
+//                    innerBounds = [],
+//                    plane = ElementsMediator.get3DProperty(elt, "elementPlane"),
+//                    pt = webkitConvertPointFromPageToNode(drawUtils.getDrawingSurfaceElement(), new WebKitPoint(event.pageX, event.pageY)),
+//                    bt = ElementsMediator.getProperty(elt, "border-top", parseFloat),
+//                    br = ElementsMediator.getProperty(elt, "border-right", parseFloat),
+//                    bb = ElementsMediator.getProperty(elt, "border-bottom", parseFloat),
+//                    bl = ElementsMediator.getProperty(elt, "border-left", parseFloat);
+//
+//                if(plane)
+//                {
+//                    bounds = plane.getBoundaryPoints().slice(0);
+//                    var b = bl || border;
+//                    var dirV = vecUtils.vecSubtract(2, bounds[3], bounds[0]);
+//                    dirV = vecUtils.vecNormalize(2, dirV, b);
+//                    innerBounds.push(vecUtils.vecAdd(2, bounds[0], dirV));
+//
+//                    b = bb || border;
+//                    dirV = vecUtils.vecSubtract(2, bounds[1], bounds[0]);
+//                    dirV = vecUtils.vecNormalize(2, dirV, b);
+//                    innerBounds.push(vecUtils.vecAdd(2, bounds[0], dirV));
+//
+//                    b = br || border;
+//                    dirV = vecUtils.vecSubtract(2, bounds[2], bounds[1]);
+//                    dirV = vecUtils.vecNormalize(2, dirV, b);
+//                    innerBounds.push(vecUtils.vecAdd(2, bounds[1], dirV));
+//
+//                    b = bt || border;