From 055694de9df70f17bfa85786b8cbc5d8e2d2e793 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 1 Feb 2023 12:32:11 -0300 Subject: [PATCH] quickSettings: Remove null checks The '_overlay' field is always set at construction to a valid actor, so there's no need to protect against null here. Part-of: --- js/ui/quickSettings.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/js/ui/quickSettings.js b/js/ui/quickSettings.js index ef8d06e51..4868cf6b3 100644 --- a/js/ui/quickSettings.js +++ b/js/ui/quickSettings.js @@ -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;