Skip to content

Commit ef26fa0

Browse files
committed
expo/overview: Refactor to Use newer/gobject class styles, easing.
- Stop using Lang.bind(). - Use actor easing instead of tweening. - Use actor/widget subclasses instead of this.actor/GenericContainers. - Use connectObject/disconnectObject for signal handling. - Use GLib instead of Mainloop. - Allow early cancel of both modes. - Cleanup rest of codebase's access to overview and expo
1 parent 5b65946 commit ef26fa0

13 files changed

Lines changed: 1385 additions & 1465 deletions

File tree

files/usr/share/cinnamon/applets/cornerbar@cinnamon.org/applet.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,11 @@ class CinnamonBarApplet extends Applet.Applet {
278278
}
279279

280280
expo() {
281-
if (!Main.expo.animationInProgress)
282-
Main.expo.toggle();
281+
Main.expo.toggle();
283282
}
284283

285284
scale() {
286-
if (!Main.overview.animationInProgress)
287-
Main.overview.toggle();
285+
Main.overview.toggle();
288286
}
289287

290288
}

files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ class CinnamonExpoApplet extends Applet.IconApplet {
3636
}
3737

3838
doAction() {
39-
if (!Main.expo.animationInProgress)
40-
Main.expo.toggle();
39+
Main.expo.toggle();
4140
}
4241
}
4342

files/usr/share/cinnamon/applets/scale@cinnamon.org/applet.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ class CinnamonScaleApplet extends Applet.IconApplet {
3636
}
3737

3838
doAction() {
39-
if (!Main.overview.animationInProgress)
40-
Main.overview.toggle();
39+
Main.overview.toggle();
4140
}
4241
}
4342

files/usr/share/cinnamon/applets/workspace-switcher@cinnamon.org/applet.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,7 @@ class CinnamonWorkspaceSwitcher extends Applet.Applet {
515515

516516
let expoMenuItem = new PopupMenu.PopupIconMenuItem(_("Manage workspaces (Expo)"), "xsi-view-grid-symbolic", St.IconType.SYMBOLIC);
517517
expoMenuItem.connect('activate', Lang.bind(this, function() {
518-
if (!Main.expo.animationInProgress)
519-
Main.expo.toggle();
518+
Main.expo.toggle();
520519
}));
521520
this._applet_context_menu.addMenuItem(expoMenuItem);
522521

js/ui/cinnamonDBus.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,11 @@ var CinnamonDBus = class {
429429
}
430430

431431
ShowExpo() {
432-
if (!Main.expo.animationInProgress)
433-
Main.expo.toggle();
432+
Main.expo.toggle();
434433
}
435434

436435
ShowOverview() {
437-
if (!Main.overview.animationInProgress)
438-
Main.overview.toggle();
436+
Main.overview.toggle();
439437
}
440438

441439
PushSubprocessResult(process_id, result, success) {

0 commit comments

Comments
 (0)