Allow texture fills in the canvas

EMGroup · Apr 7, 2017 · dc664f8 · dc664f8 · ElizabethHudnott · Apr 17, 2017
1 parent c62d421
commit dc664f8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/js/core/jseden.min.js b/js/core/jseden.min.js
diff --git a/js/selectors/selector.js b/js/selectors/selector.js
@@ -846,6 +846,11 @@ Eden.Selectors.assign = function(selector, attributes, values) {
 										res[i].prefix = "action "+vals[j]+" {";
 										res[i].name = vals[j];
 										Eden.Index.update(res[i]);
+									} else if (res[i].type == "assignment" || res[i].type=="definition") {
+										Eden.Index.remove(res[i]);
+										res[i].lvalue.name = vals[j];
+										res[i].source = res[i].source.replace(/\w*/, vals[j]);
+										Eden.Index.update(res[i]);
 									} break;
 			default: console.error("Cannot modify property '"+attribs[j]+"'");
 			}

diff --git a/plugins/canvas/canvas.js b/plugins/canvas/canvas.js
@@ -510,7 +510,10 @@ EdenUI.plugins.Canvas2D = function (edenUI, success) {
 	}
 
 	this.setFillStyle = function (context, style) {
-		if (style instanceof EdenUI.plugins.Canvas2D.FillStyle) {
+		if (style instanceof CanvasImage) {
+			var pat = context.createPattern(style.image,"repeat");
+			context.fillStyle = pat;
+		} else if (style instanceof EdenUI.plugins.Canvas2D.FillStyle) {
 			context.fillStyle = style.getColour(context);
 		} else {
 			context.fillStyle = style;

diff --git a/plugins/jseden-plugins.min.js b/plugins/jseden-plugins.min.js