Fixed text tool (dev/text-handler.js) colors

muaz-khan · Sep 24, 2018 · 31823fd · 31823fd
1 parent bcf8de5
commit 31823fd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/dev/text-handler.js b/dev/text-handler.js
@@ -2,6 +2,7 @@ var textHandler = {
     text: '',
     selectedFontFamily: 'Arial',
     selectedFontSize: '15',
+    lastFillStyle: '',
     onShapeSelected: function() {
         tempContext.canvas.style.cursor = 'text';
         this.x = this.y = this.pageX = this.pageY = 0;
@@ -105,6 +106,16 @@ var textHandler = {
     mouseup: function(e) {},
     mousemove: function(e) {},
     showOrHideTextTools: function(show) {
+        if (show === 'hide') {
+            if (this.lastFillStyle.length) {
+                fillStyle = this.lastFillStyle;
+                this.lastFillStyle = '';
+            }
+        } else if (!this.lastFillStyle.length) {
+            this.lastFillStyle = fillStyle;
+            fillStyle = 'black';
+        }
+
         this.fontFamilyBox.style.display = show == 'show' ? 'block' : 'none';
         this.fontSizeBox.style.display = show == 'show' ? 'block' : 'none';
 

diff --git a/widget.js b/widget.js
@@ -1,4 +1,4 @@
-// Last time updated: 2018-09-21 6:17:04 PM UTC
+// Last time updated: 2018-09-22 5:01:57 AM UTC
 
 // _______________
 // Canvas-Designer
@@ -1756,6 +1756,7 @@
         text: '',
         selectedFontFamily: 'Arial',
         selectedFontSize: '15',
+        lastFillStyle: '',
         onShapeSelected: function() {
             tempContext.canvas.style.cursor = 'text';
             this.x = this.y = this.pageX = this.pageY = 0;
@@ -1859,6 +1860,16 @@
         mouseup: function(e) {},
         mousemove: function(e) {},
         showOrHideTextTools: function(show) {
+            if (show === 'hide') {
+                if (this.lastFillStyle.length) {
+                    fillStyle = this.lastFillStyle;
+                    this.lastFillStyle = '';
+                }
+            } else if (!this.lastFillStyle.length) {
+                this.lastFillStyle = fillStyle;
+                fillStyle = 'black';
+            }
+
             this.fontFamilyBox.style.display = show == 'show' ? 'block' : 'none';
             this.fontSizeBox.style.display = show == 'show' ? 'block' : 'none';