From 1005ff940d65a6717653d28b81d10564e4434dea Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Sat, 23 Jun 2012 19:20:11 -0700 Subject: Adding gradient mode to tools Tools need to implement using gradients on pre-flight mode, so right now this will only set/get color but will now apply on draw until tools are made to apply color. This should be filed as individual issues per tool. --- .../tools-properties/brush-properties.reel/brush-properties.js | 2 +- .../tools-properties/fill-properties.reel/fill-properties.js | 2 +- .../ink-bottle-properties.reel/ink-bottle-properties.js | 2 +- js/components/tools-properties/pen-properties.reel/pen-properties.js | 4 ++-- .../tools-properties/shape-properties.reel/shape-properties.js | 4 ++-- js/components/tools-properties/tag-properties.reel/tag-properties.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 1af128af..d1f97260 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js @@ -74,7 +74,7 @@ var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { Object.getPrototypeOf(BrushProperties).draw.call(this); if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { - this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index ef1699af..11dec294 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js @@ -60,7 +60,7 @@ var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { Object.getPrototypeOf(FillProperties).draw.call(this); if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { - this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index 25823d11..9ae7c5bc 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js @@ -100,7 +100,7 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { // setup stroke color - this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._strokeColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); this._strokeColorCtrl.addEventListener("change", this.handleStrokeColorChange.bind(this), false); diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index 78065b99..4f7e3474 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js @@ -111,11 +111,11 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { // setup fill color - this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._fillColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); // setup stroke color - this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._strokeColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js index 7306275a..e6b71f95 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js @@ -125,11 +125,11 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { // setup fill color - this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 }; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); // setup stroke color - this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 }; this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index d38419aa..ab745049 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js @@ -65,7 +65,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { Object.getPrototypeOf(TagProperties).draw.call(this); if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { - this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; + this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 }; this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); -- cgit v1.2.3