From 878743cbbb75f2fc84855ca27779597b67ab1a95 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Mon, 2 Apr 2012 15:25:00 -0700 Subject: render the pen path with local coordinates, but use stage world coordinates to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working --- .../tools-properties/brush-properties.reel/brush-properties.html | 2 +- js/components/tools-properties/pen-properties.reel/pen-properties.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'js/components') diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 98442164..d9c35dc2 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html @@ -84,7 +84,7 @@ -
+
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 74a3a747..acbedcac 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -39,7 +39,7 @@ -
+
-- cgit v1.2.3 From c5e66f69b108e359b00c8fd897a4278812484c55 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 20 Apr 2012 12:09:54 -0700 Subject: Fixing translate handles to draw without zoom value. Also fixed some typos in zoom code. Signed-off-by: Nivesh Rajbhandari --- js/components/layout/document-bar.reel/document-bar.js | 1 - 1 file changed, 1 deletion(-) (limited to 'js/components') diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 4dc39fd6..66a02725 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js @@ -57,7 +57,6 @@ exports.DocumentBar = Montage.create(Component, { this._zoomFactor = value; if (!this._firstDraw) { - var viewUtils = this.application.ninja.stage.viewUtils; this.application.ninja.stage.setZoom(value); } } -- cgit v1.2.3 From a0daa3668883c8c35ce277b60509a3a3dcf303b2 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 24 Apr 2012 11:42:42 -0700 Subject: Allow users to toggle application of stroke and border settings when using the ink bottle tool. Signed-off-by: Nivesh Rajbhandari --- .../ink-bottle-properties.css | 24 ++++ .../ink-bottle-properties.html | 137 ++++++++++++++++++--- .../ink-bottle-properties.js | 49 +++++--- 3 files changed, 179 insertions(+), 31 deletions(-) (limited to 'js/components') diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index 7f1b0f7f..a926a0b4 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css @@ -4,3 +4,27 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ +.inkBottleProperties input[type="checkbox"].nj-skinned { + float:left; + margin-top:5px; +} + +.inkBottleProperties select.nj-skinned { + float:left; + margin:2px 5px 0 0; +} + +.inkBottleProperties label.disabled { + color:#999999; +} + +.inkBottleProperties label.disabled:hover { + color:#999999; + background-color: transparent; + cursor:default; +} + +.inkBottleProperties div.disabled:hover { + background-color: transparent; + cursor:default; +} \ No newline at end of file diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 1602e793..81facc49 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html @@ -11,6 +11,30 @@