From 51269bc1b375e1f08a0f3551a6d8d60a315c9468 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 26 Aug 2021 06:00:00 -0500
Subject: [PATCH] Updated OW GUI layout

---
 resources/app/gui/lang/en.json                |  2 +-
 .../app/gui/randomize/overworld/widgets.json  | 22 +++++++++----------
 source/gui/randomize/overworld.py             | 18 ++++++++++-----
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json
index 12e8bef8..8544efff 100644
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -124,7 +124,7 @@
     "randomizer.overworld.crossed.limited": "Limited",
     "randomizer.overworld.crossed.chaos": "Chaos",
     "randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
-    "randomizer.overworld.mixed": "Mixed",
+    "randomizer.overworld.mixed": "Tile Swap (Mixed)",
 
     "randomizer.overworld.overworldflute": "Flute Shuffle",
     "randomizer.overworld.overworldflute.vanilla": "Vanilla",
diff --git a/resources/app/gui/randomize/overworld/widgets.json b/resources/app/gui/randomize/overworld/widgets.json
index 2d15fdd3..faf4a100 100644
--- a/resources/app/gui/randomize/overworld/widgets.json
+++ b/resources/app/gui/randomize/overworld/widgets.json
@@ -9,17 +9,6 @@
         "full"
       ]
     },
-    "overworldflute": {
-      "type": "selectbox",
-      "default": "vanilla",
-      "options": [
-        "vanilla",
-        "balanced",
-        "random"
-      ]
-    }
-  },
-  "rightOverworldFrame": {
     "crossed": {
       "type": "selectbox",
       "default": "vanilla",
@@ -35,6 +24,17 @@
       "type": "checkbox",
       "default": true
     },
+    "overworldflute": {
+      "type": "selectbox",
+      "default": "vanilla",
+      "options": [
+        "vanilla",
+        "balanced",
+        "random"
+      ]
+    }
+  },
+  "rightOverworldFrame": {
     "keepsimilar": {
       "type": "checkbox",
       "default": true
diff --git a/source/gui/randomize/overworld.py b/source/gui/randomize/overworld.py
index 50cad240..77be948a 100644
--- a/source/gui/randomize/overworld.py
+++ b/source/gui/randomize/overworld.py
@@ -18,8 +18,9 @@ def overworld_page(parent):
     # These get split left & right
     self.frames["leftOverworldFrame"] = Frame(self)
     self.frames["rightOverworldFrame"] = Frame(self)
-    self.frames["leftOverworldFrame"].pack(side=LEFT, anchor=NW)
-    self.frames["rightOverworldFrame"].pack(anchor=NW)
+
+    self.frames["leftOverworldFrame"].pack(side=LEFT, anchor=NW, fill=Y)
+    self.frames["rightOverworldFrame"].pack(anchor=NW, fill=Y)
     
     with open(os.path.join("resources","app","gui","randomize","overworld","widgets.json")) as overworldWidgets:
         myDict = json.load(overworldWidgets)
@@ -27,9 +28,14 @@ def overworld_page(parent):
             dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename])
             for key in dictWidgets:
                 self.widgets[key] = dictWidgets[key]
-                if framename == "rightOverworldFrame":
-                    self.widgets[key].pack(side=LEFT)
-                else:
-                    self.widgets[key].pack(anchor=E)
+                packAttrs = {"anchor":E}
+                if key == "keepsimilar":
+                    packAttrs = {"side":LEFT, "pady":(18,0)}
+                elif key == "overworldflute":
+                    packAttrs["pady"] = (20,0)
+                elif key == "mixed":
+                    packAttrs = {"anchor":W, "padx":(79,0)}
+                
+                self.widgets[key].pack(packAttrs)
 
     return self