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

quickSettings: Remove null checks

Browse Source 
The '_overlay' field is always set at construction to a valid actor,
so there's no need to protect against null here.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2624>
This commit is contained in:
Georges Basile Stavracas Neto 2023-02-01 12:32:11 -03:00 committed by Marge Bot
parent d69be8d232
commit 055694de9d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/quickSettings.js
View File

@ -631,9 +631,7 @@ const QuickSettingsLayout = GObject.registerClass({
vfunc_get_preferred_height(container, _forWidth) {
const rows = this._getRows(container);
let [minHeight, natHeight] = this._overlay
? this._overlay.get_preferred_height(-1)
: [0, 0];
let [minHeight, natHeight] = this._overlay.get_preferred_height(-1);
const spacing = (rows.length - 1) * this.row_spacing;
minHeight += spacing;
@ -651,14 +649,12 @@ const QuickSettingsLayout = GObject.registerClass({
vfunc_allocate(container, box) {
const rows = this._getRows(container);
const [, overlayHeight] = this._overlay
? this._overlay.get_preferred_height(-1)
: [0, 0];
const [, overlayHeight] = this._overlay.get_preferred_height(-1);
const availWidth = box.get_width() - (this.nColumns - 1) * this.column_spacing;
const childWidth = Math.floor(availWidth / this.nColumns);
this._overlay?.allocate_available_size(0, 0, box.get_width(), box.get_height());
this._overlay.allocate_available_size(0, 0, box.get_width(), box.get_height());
const isRtl = container.text_direction === Clutter.TextDirection.RTL;