From 9b179778b9ebfc14a8d554c8aa79deea59efbd23 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Fri, 10 Sep 2021 10:20:14 -0700
Subject: [PATCH] Fixed rows before columns inconsistency.

---
 src/game/sandbox/sandboxscene.c | 4 +++-
 src/ui/grid.c                   | 2 +-
 src/ui/grid.h                   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/game/sandbox/sandboxscene.c b/src/game/sandbox/sandboxscene.c
index 4d8ee7ea..845a3e51 100644
--- a/src/game/sandbox/sandboxscene.c
+++ b/src/game/sandbox/sandboxscene.c
@@ -18,7 +18,7 @@ bool sandboxSceneInit(sandboxscene_t *game) {
   
   framedTextMenuInit(&menu, &game->font, &game->texture);
   
-  gridAddBreakpoint(&menu.menu.menu.grid, -1, 3, 1, 0, 0);
+  gridAddBreakpoint(&menu.menu.menu.grid, -1, 2, 3, 0, 0);
 
   gridchild_t *child = textMenuListAdd(&menu.menu, "First");
   gridChildAddBreakpoint(child, 0,0, 1,1);
@@ -26,6 +26,8 @@ bool sandboxSceneInit(sandboxscene_t *game) {
   gridChildAddBreakpoint(child, 0,1, 1,1);
   child = textMenuListAdd(&menu.menu, "Third");
   gridChildAddBreakpoint(child, 0,2, 1,1);
+  child = textMenuListAdd(&menu.menu, "Fourth");
+  gridChildAddBreakpoint(child, 1,0, 1,1);
 
   return true;
 }
diff --git a/src/ui/grid.c b/src/ui/grid.c
index 19c19465..5c787947 100644
--- a/src/ui/grid.c
+++ b/src/ui/grid.c
@@ -18,7 +18,7 @@ void gridInit(grid_t *grid) {
 
 uint8_t gridAddBreakpoint(
   grid_t *grid, float width,
-  uint8_t rows, uint8_t columns,
+  uint8_t columns, uint8_t rows,
   float gutterX, float gutterY
 ) {
   uint8_t i = grid->breakpointCount++;
diff --git a/src/ui/grid.h b/src/ui/grid.h
index eda7a21d..b6f1603f 100644
--- a/src/ui/grid.h
+++ b/src/ui/grid.h
@@ -20,15 +20,15 @@ void gridInit(grid_t *grid);
  * 
  * @param grid Grid to add to.
  * @param width Screen dimension width of the breakpoint.
- * @param rows How many rows at this breakpoint.
  * @param columns How many columns at this breakpoint.
+ * @param rows How many rows at this breakpoint.
  * @param gutterX Gutter X at this breakpoint.
  * @param gutterY Gutter Y at this breakpoint.
  * @return Index of the breakpoint within the grid.
  */
 uint8_t gridAddBreakpoint(
   grid_t *grid, float width,
-  uint8_t rows, uint8_t columns,
+  uint8_t columns, uint8_t rows,
   float gutterX, float gutterY
 );