From 65cebd67ee7bb36c612981766daca78fb1e779ad Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 21 Nov 2017 12:39:41 +1300
Subject: [PATCH] Fixed issue with export
---
sources/scripts/core/cursor.js | 2 ++
sources/scripts/core/hint.js | 3 +++
sources/scripts/core/keyboard.js | 1 +
sources/scripts/layers/guide.js | 2 --
sources/scripts/modules/brush.js | 4 ++++
sources/scripts/modules/frame.js | 2 +-
6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/sources/scripts/core/cursor.js b/sources/scripts/core/cursor.js
index a48276e..575fd22 100644
--- a/sources/scripts/core/cursor.js
+++ b/sources/scripts/core/cursor.js
@@ -15,6 +15,8 @@ function Cursor(rune)
{
this.clear();
+ if(!pos){ return; }
+
var ctx = this.context();
var radius = ronin.cursor.size;
diff --git a/sources/scripts/core/hint.js b/sources/scripts/core/hint.js
index bd0c605..94febcc 100644
--- a/sources/scripts/core/hint.js
+++ b/sources/scripts/core/hint.js
@@ -58,6 +58,9 @@ function Hint()
if(ac.length > 0){
this.el.innerHTML = this.pad(ronin.commander.input_el.value)+"<span class='autocomplete'>"+ac[0]+"</span> > Press tab to autocomplete."
}
+ else if(ronin.commander.input_el.value == "~"){
+ this.el.innerHTML = this.pad(ronin.commander.input_el.value)+" > Select a color."
+ }
else{
this.el.innerHTML = this.pad(ronin.commander.input_el.value)+" > Unknown command."
}
diff --git a/sources/scripts/core/keyboard.js b/sources/scripts/core/keyboard.js
index 1ee3705..20829b6 100644
--- a/sources/scripts/core/keyboard.js
+++ b/sources/scripts/core/keyboard.js
@@ -35,6 +35,7 @@ function Keyboard()
if(e.key == "tab" || e.keyCode == 9){
e.preventDefault();
+ ronin.cursor.update();
ronin.commander.autocomplete();
return;
}
diff --git a/sources/scripts/layers/guide.js b/sources/scripts/layers/guide.js
index 676ce00..278c6c3 100644
--- a/sources/scripts/layers/guide.js
+++ b/sources/scripts/layers/guide.js
@@ -43,7 +43,6 @@ function Guide()
if(!show){ return; }
var originalData = ronin.render.context().getImageData(0, 0, ronin.frame.width*2, ronin.frame.height*2);
var data = originalData.data;
-
for(var i = 0; i < data.length; i += 4) {
var x = i % (ronin.frame.width*8)
var y = i / (ronin.frame.width*32)
@@ -52,7 +51,6 @@ function Guide()
data[i + 2] = y;
data[i + 3] = 255;
}
-
ronin.layers.guide.context().putImageData(originalData, 0, 0);
}
diff --git a/sources/scripts/modules/brush.js b/sources/scripts/modules/brush.js
index c628737..619f808 100644
--- a/sources/scripts/modules/brush.js
+++ b/sources/scripts/modules/brush.js
@@ -24,6 +24,10 @@ function Brush()
ronin.hint.update();
})
+ this.methods.set_color = new Method("set_color","#ff0033","Set color",function(q){
+ ronin.cursor.color = q;
+ })
+
this.absolute_thickness = 0;
this.thickness = function(line)
diff --git a/sources/scripts/modules/frame.js b/sources/scripts/modules/frame.js
index 2a3c4c1..3f15dcb 100644
--- a/sources/scripts/modules/frame.js
+++ b/sources/scripts/modules/frame.js
@@ -15,7 +15,7 @@ function Frame()
this.methods.rescale = new Method("rescale","0.5","Rescale canvas to float.",function(p){
var new_size = {width:ronin.frame.width * p,height:ronin.frame.height * p};
ronin.render.context().drawImage(ronin.render.to_img(),0,0,new_size.width * 2,new_size.height * 2);
- setTimeout(ronin.frame.methods.resize.run(new_size),2000)
+ setTimeout(function(){ ronin.frame.methods.resize.run(new_size);},1000)
});
this.methods.crop = new Method("crop","X,Y|WxH","Crop canvas to rect.",function(p){