[morph] fix getting equal brush

ONLYOFFICE · Jul 17, 2023 · 9e654d4 · 9e654d4
1 parent 27c4ae1
commit 9e654d4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/common/Drawings/Format/Format.js b/common/Drawings/Format/Format.js
@@ -5337,6 +5337,11 @@
 				return true;
 			}
 		};
+		CUniFill.prototype.isGradientFill = function() {
+			if(this.fill && this.fill.type === c_oAscFill.FILL_TYPE_GRAD) {
+				return true;
+			}
+		};
 		CUniFill.prototype.checkTransparent = function() {
 			let oFill = this.fill;
 			if(oFill) {

diff --git a/slide/Drawing/MorphTransition.js b/slide/Drawing/MorphTransition.js
@@ -559,7 +559,10 @@
         }
         let oBrush = oBrush1;
 
-        if(oBrush1 && oBrush1.isSolidFill() &&  oBrush2 && oBrush2.isSolidFill()) {
+        if(oBrush1 && oBrush1.isEqual(oBrush2)) {
+            return oBrush1;
+        }
+        else if(oBrush1 && oBrush1.isSolidFill() &&  oBrush2 && oBrush2.isSolidFill()) {
             const oRGBA1 = oBrush1.getRGBAColor();
             const oRGBA2 = oBrush2.getRGBAColor();
             const R = this.getValBetween(oRGBA1.R, oRGBA2.R) + 0.5 >> 0;