From ff9fae1e2a9927b622cc8aeba0cfe797176af209 Mon Sep 17 00:00:00 2001
From: Anders Gustafsson <anders@photowall.se>
Date: Fri, 23 Mar 2018 10:48:43 +0100
Subject: [PATCH] P5-2309 Fix disabled buttons styling

---
 dist/image-editor.js      | 10 +++++-----
 src/TextButton.js         |  2 ++
 src/config/button-menu.js |  4 ----
 src/config/text-button.js |  4 +++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dist/image-editor.js b/dist/image-editor.js
index b686beb..d93a2d3 100644
--- a/dist/image-editor.js
+++ b/dist/image-editor.js
@@ -1671,6 +1671,8 @@ function TextButton(id, text, settings, isActive) {
 
         _rect.setFill(_rectSettings[this.disabled ? 'disabledFill' : 'fill']);
         _text.setFill(_textSettings[this.disabled ? 'disabledFill' : 'fill']);
+
+        this.hoverCursor = this.disabled ? config.textButton.disabledCursor : config.textButton.cursor;
     };
 
     if (_textSettings.text) {
@@ -1917,12 +1919,10 @@ module.exports = {
         text: {
             fill: '#ffffff',
             activeFill: '#ffffff',
-            disabledFill: '#ffffff'
         },
         rect: {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999'
         },
     },
 
@@ -1943,12 +1943,10 @@ module.exports = {
         text: {
             fill: '#ffffff',
             activeFill: '#ffffff',
-            disabledFill: '#ffffff'
         },
         rect: {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999'
         },
     }
 
@@ -2067,7 +2065,7 @@ module.exports = {
         return {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999',
+            disabledFill: '#494949',
             originX: 'center',
             originY: 'center',
             width: width || 1,
@@ -2079,6 +2077,7 @@ module.exports = {
 
     text: {
         fill: '#ffffff',
+        disabledFill: '#999999',
         fontFamily: 'breuer',
         fontSize: 14,
         originX: 'center',
@@ -2086,6 +2085,7 @@ module.exports = {
     },
 
     cursor: 'pointer',
+    disabledCursor: 'default',
     padding: 20,
 };
 
diff --git a/src/TextButton.js b/src/TextButton.js
index f8737c0..a99cebd 100644
--- a/src/TextButton.js
+++ b/src/TextButton.js
@@ -111,6 +111,8 @@ function TextButton(id, text, settings, isActive) {
 
         _rect.setFill(_rectSettings[this.disabled ? 'disabledFill' : 'fill']);
         _text.setFill(_textSettings[this.disabled ? 'disabledFill' : 'fill']);
+
+        this.hoverCursor = this.disabled ? config.textButton.disabledCursor : config.textButton.cursor;
     };
 
     if (_textSettings.text) {
diff --git a/src/config/button-menu.js b/src/config/button-menu.js
index f83a41f..29c7392 100644
--- a/src/config/button-menu.js
+++ b/src/config/button-menu.js
@@ -7,12 +7,10 @@ module.exports = {
         text: {
             fill: '#ffffff',
             activeFill: '#ffffff',
-            disabledFill: '#ffffff'
         },
         rect: {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999'
         },
     },
 
@@ -33,12 +31,10 @@ module.exports = {
         text: {
             fill: '#ffffff',
             activeFill: '#ffffff',
-            disabledFill: '#ffffff'
         },
         rect: {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999'
         },
     }
 
diff --git a/src/config/text-button.js b/src/config/text-button.js
index d95e0e7..2f2a1a5 100644
--- a/src/config/text-button.js
+++ b/src/config/text-button.js
@@ -6,7 +6,7 @@ module.exports = {
         return {
             fill: '#343434',
             activeFill: '#494949',
-            disabledFill: '#999999',
+            disabledFill: '#494949',
             originX: 'center',
             originY: 'center',
             width: width || 1,
@@ -18,6 +18,7 @@ module.exports = {
 
     text: {
         fill: '#ffffff',
+        disabledFill: '#999999',
         fontFamily: 'breuer',
         fontSize: 14,
         originX: 'center',
@@ -25,5 +26,6 @@ module.exports = {
     },
 
     cursor: 'pointer',
+    disabledCursor: 'default',
     padding: 20,
 };