From cc3ac49c57f431cb0eea75aafe4e13fec26d4f9e Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 25 Jun 2021 16:36:00 -0500
Subject: [PATCH] Rearranged OW Shuffle GUI

---
 .../app/gui/randomize/overworld/widgets.json  | 12 ++++++----
 source/gui/randomize/overworld.py             | 23 +++++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/resources/app/gui/randomize/overworld/widgets.json b/resources/app/gui/randomize/overworld/widgets.json
index dfacfbd6..b4b63e1f 100644
--- a/resources/app/gui/randomize/overworld/widgets.json
+++ b/resources/app/gui/randomize/overworld/widgets.json
@@ -1,9 +1,5 @@
 {
-  "widgets": {
-    "keepsimilar": {
-      "type": "checkbox",
-      "default": true
-    },
+  "leftOverworldFrame": {
     "overworldshuffle": {
       "type": "selectbox",
       "default": "vanilla",
@@ -22,5 +18,11 @@
         "crossed"
       ]
     }
+  },
+  "rightOverworldFrame": {
+    "keepsimilar": {
+      "type": "checkbox",
+      "default": true
+    }
   }
 }
\ No newline at end of file
diff --git a/source/gui/randomize/overworld.py b/source/gui/randomize/overworld.py
index 350d0e31..8a080c59 100644
--- a/source/gui/randomize/overworld.py
+++ b/source/gui/randomize/overworld.py
@@ -1,4 +1,4 @@
-from tkinter import ttk, Frame, Label, E, W, LEFT, RIGHT
+from tkinter import ttk, Frame, Label, E, NW, LEFT, RIGHT, X, TOP
 import source.gui.widgets as widgets
 import json
 import os
@@ -17,13 +17,22 @@ def overworld_page(parent):
     # Defns include frame name, widget type, widget options, widget placement attributes
     # These get split left & right
     self.frames["widgets"] = Frame(self)
-    self.frames["widgets"].pack(anchor=W)
+    self.frames["leftOverworldFrame"] = Frame(self.frames["widgets"])
+    self.frames["rightOverworldFrame"] = Frame(self.frames["widgets"])
+    self.frames["bottomEnemizerFrame"] = Frame(self)
+    self.frames["widgets"].pack(fill=X)
+    self.frames["leftOverworldFrame"].pack(side=LEFT)
+    self.frames["rightOverworldFrame"].pack(side=TOP, anchor=NW)
+    
     with open(os.path.join("resources","app","gui","randomize","overworld","widgets.json")) as overworldWidgets:
         myDict = json.load(overworldWidgets)
-        myDict = myDict["widgets"]
-        dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["widgets"])
-        for key in dictWidgets:
-            self.widgets[key] = dictWidgets[key]
-            self.widgets[key].pack(anchor=W)
+        for framename,theseWidgets in myDict.items():
+            dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename])
+            for key in dictWidgets:
+                self.widgets[key] = dictWidgets[key]
+                if key == "rightOverworldFrame":
+                    self.widgets[key].pack(anchor=NW)
+                else:
+                    self.widgets[key].pack(anchor=E)
 
     return self