PAINTROID-498 Line Color Changing

Catrobat · Dec 13, 2022 · 03e4d23 · 03e4d23
1 parent f61f587
commit 03e4d23
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...roid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt b/...roid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
@@ -113,7 +113,7 @@ class DefaultCommandManager(
         notifyCommandExecuted()
     }
 
-    private fun handleUndo(command: Command) {
+    private fun handleUndo(command: Command, ignoreColorCommand: Boolean = false) {
         var success = true
         var layerCount = layerModel.layerCount
         val currentCommandName = command.javaClass.simpleName
@@ -153,9 +153,13 @@ class DefaultCommandManager(
 
         val iterator = undoCommandList.descendingIterator()
         while (iterator.hasNext()) {
+            var nextCommand = iterator.next()
+            if (nextCommand is ColorChangedCommand && ignoreColorCommand) {
+                continue
+            }
             val currentLayer = layerModel.currentLayer
             canvas.setBitmap(currentLayer?.bitmap)
-            iterator.next().run(canvas, layerModel)
+            nextCommand.run(canvas, layerModel)
         }
 
         if (!currentCommandName.matches(mergeLayerCommandRegex)) {
@@ -231,7 +235,7 @@ class DefaultCommandManager(
         if (undoCommandList.isNotEmpty() && undoCommandList.first != null) {
             val command = undoCommandList.pop()
             redoCommandList.addFirst(command)
-            handleUndo(command)
+            handleUndo(command, true)
         }
         return colorCommandList
     }