Merge branch 'pr/1601' into dev

llaske · Apr 18, 2024 · 89514cc · 89514cc
2 parents 42cacf0 + 67d05cd
commit 89514cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Extra icon rendering in QRCode activity #1193
 - Message Updation in Fraction Activity #1453
 - LabyrinthJS: No selection-indicator is visible while linking ideas #1585
+- Gear unexpected behavior of Play toolbar icon #1600
 
 ## [1.8.0] - 2024-04-10
 ### Added

diff --git a/activities/Gears.activity/js/activity.js b/activities/Gears.activity/js/activity.js
@@ -55,12 +55,16 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
         gearSketch.selectButton = function (buttonName) {
             return this.selectedButton = buttonName;
         }
-
+        function UISwitch(before, after){
+            playButton.classList.remove(before);
+            playButton.classList.add(after);
+        }
         // Gear button.
         gearButton.addEventListener('click', function (event) {
             if (gearSketch.isDemoPlaying) {
                 gearSketch.stopDemo();
             }
+            UISwitch('pause', 'play');
             gearSketch.selectButton("gearButton");
         });
 
@@ -69,6 +73,7 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
             if (gearSketch.isDemoPlaying) {
                 gearSketch.stopDemo();
             }
+            UISwitch('pause', 'play');
             gearSketch.selectButton("chainButton");
         });
 
@@ -77,6 +82,7 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
             if (gearSketch.isDemoPlaying) {
                 gearSketch.stopDemo();
             }
+            UISwitch('pause', 'play');
             gearSketch.selectButton("momentumButton");
         });
 
@@ -87,13 +93,11 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
             }
             if(gearSketch.selectedButton == "playButton"){
                 gearSketch.selectButton(null);
-                playButton.classList.remove('pause');
-                playButton.classList.add('play');
+                UISwitch('pause', 'play');
             }
             else{
                 gearSketch.selectButton("playButton");
-                playButton.classList.remove('play');
-                playButton.classList.add('pause');
+                UISwitch('play', 'pause');
             }
         });
 
@@ -108,6 +112,7 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
                 gearSketch.stopDemo();
                 return;
             }
+            UISwitch('pause', 'play');
             gearSketch.board.clear();
         });
 
@@ -120,7 +125,7 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
             }
             gearSketch.playDemo();
         });
-
+        
         // Full screen.
         document.getElementById("fullscreen-button").addEventListener('click', function() {
             document.getElementById("main-toolbar").style.opacity = 0;