Handled other mods nuking my GUI

Bilka2 · May 24, 2019 · eb63d66 · eb63d66
1 parent 192302f
commit eb63d66
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.1.1
+Date: 24. 05. 2019
+  Bugfixes:
+    - Handled other mods nuking my GUI.
+---------------------------------------------------------------------------------------------------
 Version: 3.1.0
 Date: 24. 05. 2019
   Features:

diff --git a/control.lua b/control.lua
@@ -272,7 +272,13 @@ script.on_event({defines.events.on_gui_click}, function(event)
   local frame_flow = mod_gui.get_frame_flow(player)
   local clicked_name = event.element.name
   if clicked_name == "change-map-settings-toggle-config" then
-    frame_flow["change-map-settings-main-flow"].visible = not frame_flow["change-map-settings-main-flow"].visible
+    local main_flow = frame_flow["change-map-settings-main-flow"]
+    if not main_flow then
+      gui.regen(player)
+      set_to_current_all(player)
+      main_flow = frame_flow["change-map-settings-main-flow"]
+    end
+    main_flow.visible = not main_flow.visible
   elseif clicked_name == "change-map-settings-start-button" then
     if player.admin then
       change_map_settings(player)

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "ChangeMapSettings",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "factorio_version" : "0.17",
   "title": "Change Map Settings",
   "author": "Bilka",

diff --git a/map_gen_settings_gui.lua b/map_gen_settings_gui.lua
@@ -22,6 +22,7 @@ map_gen_gui.create = function(parent)
   local resource_scroll_pane = frame1.add{
     type = "scroll-pane",
     name = ENTIRE_PREFIX .. "resource-scroll-pane",
+    style ="scroll_pane_light"
   }
   resource_scroll_pane.style.maximal_height = 300
   map_gen_gui.create_resource_table(resource_scroll_pane)
@@ -31,8 +32,9 @@ map_gen_gui.create = function(parent)
   local terrain_scroll_pane = frame2.add{
     type = "scroll-pane",
     name = ENTIRE_PREFIX .. "terrain-scroll-pane",
+    style ="scroll_pane_light"
   }
-  terrain_scroll_pane.style.maximal_height = 300
+  terrain_scroll_pane.style.maximal_height = 150
   map_gen_gui.create_controls_with_scale_table(terrain_scroll_pane)
   map_gen_gui.create_cliffs_table(frame2)
   map_gen_gui.create_climate_table(frame2)