[mutter] workspace-manager, x11-display: Default to a single row

[Marge Bot <marge-bot src gnome org>]

commit 4927452b8419b99093bc429d8bbdfe37985004a0
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jan 27 11:28:49 2021 -0300

    workspace-manager, x11-display: Default to a single row
    
    This seems to have been the default in the past, but was (accidentally?) modified
    by 8adab0275.
    
    For GNOME 40, we'll be returning to our root with horizontal workspaces, so instead
    of overriding it in GNOME Shell side, change the default back to what it once was.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1684>

 src/core/meta-workspace-manager.c | 4 ++--
 src/x11/meta-x11-display.c        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c
index 2e2262702c..61fbc00903 100644
--- a/src/core/meta-workspace-manager.c
+++ b/src/core/meta-workspace-manager.c
@@ -243,8 +243,8 @@ meta_workspace_manager_new (MetaDisplay *display)
   meta_workspace_manager_update_workspace_layout (workspace_manager,
                                                   META_DISPLAY_TOPLEFT,
                                                   FALSE,
-                                                  -1,
-                                                  1);
+                                                  1,
+                                                  -1);
 
   /* There must be at least one workspace at all times,
    * so create that required workspace.
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index f11684f14d..156304d6b4 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -2164,8 +2164,8 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display)
 {
   MetaWorkspaceManager *workspace_manager = x11_display->display->workspace_manager;
   gboolean vertical_layout = FALSE;
-  int n_rows = -1;
-  int n_columns = 1;
+  int n_rows = 1;
+  int n_columns = -1;
   MetaDisplayCorner starting_corner = META_DISPLAY_TOPLEFT;
   uint32_t *list;
   int n_items;