brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iconGrid: Trivial style cleanup

Browse Source 
Turns out, we only needed a gentle push to get this whole
file fit in.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1477
This commit is contained in:
Georges Basile Stavracas Neto 2020-10-21 12:58:29 -03:00
parent 5cfec80e9d
commit b3659221bd
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/iconGrid.js
View File

@ -66,9 +66,11 @@ var DragLocation = {
var BaseIcon = GObject.registerClass( var BaseIcon = GObject.registerClass(
class BaseIcon extends St.Bin { class BaseIcon extends St.Bin {
_init(label, params) { _init(label, params) {
params = Params.parse(params, { createIcon: null, params = Params.parse(params, {
createIcon: null,
setSizeManually: false, setSizeManually: false,
showLabel: true }); showLabel: true,
});
let styleClass = 'overview-icon'; let styleClass = 'overview-icon';
if (params.showLabel) if (params.showLabel)
@ -126,7 +128,7 @@ class BaseIcon extends St.Bin {
if (!this._setSizeManually) if (!this._setSizeManually)
throw new Error('setSizeManually has to be set to use setIconsize'); throw new Error('setSizeManually has to be set to use setIconsize');
if (size == this.iconSize) if (size === this.iconSize)
return; return;
this._createIconTexture(size); this._createIconTexture(size);
@ -156,7 +158,7 @@ class BaseIcon extends St.Bin {
size = found ? len / scaleFactor : ICON_SIZE; size = found ? len / scaleFactor : ICON_SIZE;
} }
if (this.iconSize == size && this._iconBin.child) if (this.iconSize === size && this._iconBin.child)
return; return;
this._createIconTexture(size); this._createIconTexture(size);
@ -196,8 +198,10 @@ function zoomOutActor(actor) {
} }
function zoomOutActorAtPos(actor, x, y) { function zoomOutActorAtPos(actor, x, y) {
let actorClone = new Clutter.Clone({ source: actor, const actorClone = new Clutter.Clone({
reactive: false }); source: actor,
reactive: false,
});
let [width, height] = actor.get_transformed_size(); let [width, height] = actor.get_transformed_size();
actorClone.set_size(width, height); actorClone.set_size(width, height);
@ -1580,7 +1584,7 @@ var IconGrid = GObject.registerClass({
this._resetAnimationActors(); this._resetAnimationActors();
let actors = this._getChildrenToAnimate(); let actors = this._getChildrenToAnimate();
if (actors.length == 0) { if (actors.length === 0) {
this._animationDone(); this._animationDone();
return; return;
} }
@ -1631,8 +1635,8 @@ var IconGrid = GObject.registerClass({
let [adjustedSourcePositionX, adjustedSourcePositionY] = [sourceCenterX - sourceScaledWidth / 2, sourceCenterY - sourceScaledHeight / 2]; let [adjustedSourcePositionX, adjustedSourcePositionY] = [sourceCenterX - sourceScaledWidth / 2, sourceCenterY - sourceScaledHeight / 2];
let movementParams, fadeParams; let movementParams, fadeParams;
if (animationDirection == AnimationDirection.IN) { if (animationDirection === AnimationDirection.IN) {
let isLastItem = actor._distance == minDist; const isLastItem = actor._distance === minDist;
actorClone.opacity = 0; actorClone.opacity = 0;
actorClone.set_scale(scaleX, scaleY); actorClone.set_scale(scaleX, scaleY);
@ -1661,7 +1665,7 @@ var IconGrid = GObject.registerClass({
delay, delay,
}; };
} else { } else {
let isLastItem = actor._distance == maxDist; const isLastItem = actor._distance === maxDist;
let [startX, startY] = actor._transformedPosition; let [startX, startY] = actor._transformedPosition;
actorClone.set_translation(startX, startY, 0); actorClone.set_translation(startX, startY, 0);