From ac3faac38ce5cbae834faedc59cd241fed22ae4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 29 Jan 2021 15:38:08 +0100
Subject: [PATCH] overviewControls: Remove intermediate box

Now that the workspace switcher moved into the view selector, the
box only holds a single child. Cut out the middle man and add that
directly to the parent.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1609>
---
 js/ui/overviewControls.js | 8 +-------
 js/ui/viewSelector.js     | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index af420c528..e87c5042a 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -85,13 +85,7 @@ class ControlsManager extends St.Widget {
         });
         this.add_actor(this._group);
 
-        const box = new St.BoxLayout({
-            x_expand: true,
-            y_expand: true,
-        });
-        box.add_child(this.viewSelector);
-
-        this._group.add_child(box);
+        this._group.add_child(this.viewSelector);
         this._group.add_actor(this._dashFader);
 
         this.connect('destroy', this._onDestroy.bind(this));
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 5a22cb215..6655ed31f 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -241,6 +241,7 @@ var ViewSelector = GObject.registerClass({
         super._init({
             name: 'viewSelector',
             x_expand: true,
+            y_expand: true,
             visible: false,
         });