Updated OW GUI layout

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",

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

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":
+                packAttrs = {"anchor":E}
-                    self.widgets[key].pack(side=LEFT)
+                if key == "keepsimilar":
-                else:
+                    packAttrs = {"side":LEFT, "pady":(18,0)}
-                    self.widgets[key].pack(anchor=E)
+                elif key == "overworldflute":
+                    packAttrs["pady"] = (20,0)
+                elif key == "mixed":
+                    packAttrs = {"anchor":W, "padx":(79,0)}
+                
+                self.widgets[key].pack(packAttrs)
 
     return self