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

cleanup: Use new indentation style for arrays

Browse Source 
We've made some progress on transitioning to the modern indentation
style, and for arrays the legacy style is now rare enough to make
a bulk transition feasible.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2200>
This commit is contained in:
Florian Müllner
2020-03-27 14:18:34 +01:00
committed by Marge Bot
parent 696965c9f7
commit ac9fbe92e5
15 changed files with 125 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/messageList.js
View File

@ -192,16 +192,20 @@ class ScaleLayout extends Clutter.BinLayout {
this._connectContainer(container);
let [min, nat] = super.vfunc_get_preferred_width(container, forHeight);
return [Math.floor(min * container.scale_x),
Math.floor(nat * container.scale_x)];
return [
Math.floor(min * container.scale_x),
Math.floor(nat * container.scale_x),
];
}
vfunc_get_preferred_height(container, forWidth) {
this._connectContainer(container);
let [min, nat] = super.vfunc_get_preferred_height(container, forWidth);
return [Math.floor(min * container.scale_y),
Math.floor(nat * container.scale_y)];
return [
Math.floor(min * container.scale_y),
Math.floor(nat * container.scale_y),
];
}
});
@ -275,10 +279,14 @@ var LabelExpanderLayout = GObject.registerClass({
if (children[1]) {
let [min2, nat2] = children[1].get_preferred_height(forWidth);
let [expMin, expNat] = [Math.min(min2, min * this._expandLines),
Math.min(nat2, nat * this._expandLines)];
[min, nat] = [min + this._expansion * (expMin - min),
nat + this._expansion * (expNat - nat)];
const [expMin, expNat] = [
Math.min(min2, min * this._expandLines),
Math.min(nat2, nat * this._expandLines),
];
[min, nat] = [
min + this._expansion * (expMin - min),
nat + this._expansion * (expNat - nat),
];
}
return [min, nat];