[gnome-shell/gbsneto/icon-grid-dnd: 1/18] allView: Scale in when moving icons from folders
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/icon-grid-dnd: 1/18] allView: Scale in when moving icons from folders
- Date: Tue, 2 Jul 2019 20:48:52 +0000 (UTC)
commit fd131f04e146b5deea00f49c191aea5398de883a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Jun 29 14:09:32 2019 -0300
allView: Scale in when moving icons from folders
App icons inside folders are already animated when the folder is
opened, but moving an app icon from a folder doesn't, making the
transition abrupt.
Fortunately, it's easy to detect icons that were previously hidden
but are not anymore.
Add an animation to these icons when showing.
WIP: tentatively using the Tweener parameters from Endless OS.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/603
js/ui/appDisplay.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e88ed087d..7c363894e 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -38,6 +38,9 @@ var VIEWS_SWITCH_ANIMATION_DELAY = 0.1;
var PAGE_SWITCH_TIME = 0.3;
+var APP_ICON_SCALE_IN_TIME = 0.5;
+var APP_ICON_SCALE_IN_DELAY = 0.7;
+
const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
@@ -344,6 +347,8 @@ var AllView = class AllView extends BaseAppView {
}
_refilterApps() {
+ let filteredApps = this._allItems.filter(icon => !icon.actor.visible);
+
this._allItems.forEach(icon => {
if (icon instanceof AppIcon)
icon.actor.visible = true;
@@ -356,6 +361,14 @@ var AllView = class AllView extends BaseAppView {
appIcon.actor.visible = false;
});
});
+
+ // Scale in app icons that weren't visible, but now are
+ this._allItems.filter(icon => {
+ return icon.actor.visible && filteredApps.includes(icon);
+ }).forEach(icon => {
+ if (icon instanceof AppIcon)
+ icon.scheduleScaleIn();
+ });
}
getAppInfos() {
@@ -1627,6 +1640,7 @@ var AppIcon = class AppIcon {
this._iconContainer.add_child(this._dot);
this.actor._delegate = this;
+ this._scaleInId = 0;
if (!iconParams)
iconParams = {};
@@ -1827,6 +1841,46 @@ var AppIcon = class AppIcon {
this.icon.animateZoomOut();
}
+ _scaleIn() {
+ this.actor.scale_x = 0;
+ this.actor.scale_y = 0;
+ this.actor.pivot_point = new Clutter.Point({ x: 0.5, y: 0.5 });
+
+ Tweener.addTween(this.actor, {
+ scale_x: 1,
+ scale_y: 1,
+ time: APP_ICON_SCALE_IN_TIME,
+ delay: APP_ICON_SCALE_IN_DELAY,
+ transition: (t, b, c, d) => {
+ // Similar to easeOutElastic, but less aggressive.
+ t /= d;
+ let p = 0.5;
+ return b + c * (Math.pow(2, -11 * t) * Math.sin(2 * Math.PI * (t - p / 4) / p) + 1);
+ }
+ });
+ }
+
+ _unscheduleScaleIn() {
+ if (this._scaleInId != 0) {
+ this.actor.disconnect(this._scaleInId);
+ this._scaleInId = 0;
+ }
+ }
+
+ scheduleScaleIn() {
+ if (this._scaleInId != 0)
+ return;
+
+ if (this.actor.mapped) {
+ this._scaleIn();
+ } else {
+ this._scaleInId = this.actor.connect('notify::mapped', () => {
+ this._unscheduleScaleIn();
+ this._scaleIn();
+ })
+ }
+ }
+
shellWorkspaceLaunch(params) {
params = Params.parse(params, { workspace: -1,
timestamp: 0 });
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]