diff --git a/README.md b/README.md index 8a55ea1..42b0694 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,12 @@ time. JoCKeRiL (Hebrew), Rikkilook (Russian), theRustyKnife (Czech), thomaskneisel and BenediktMagnus (German), diilmac (Polish), Xagros (Korean), futuroattore86 (Italian). +* Updating assistance by @kylewill0725! ## License ## -The source of **EvoGUI** is Copyright 2015-2017 Octav "narc" Sandulescu. It +The source of **EvoGUI** is Copyright 2015-2019 Octav "narc" Sandulescu. It is licensed under the [MIT license][mit], available in this package in the file [LICENSE.md](LICENSE.md). diff --git a/VERSION b/VERSION index ad01be3..41b5ce3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.302 +0.4.401 diff --git a/control.lua b/control.lua index 1df7f91..436f4ff 100644 --- a/control.lua +++ b/control.lua @@ -73,10 +73,6 @@ local function raise_on_click(event) end script.on_event(defines.events.on_gui_checked_state_changed, function(event) - -- prevent raising on_click twice for the same element - if last_clicked ~= nil and last_clicked == event.element.name then - return - end last_checked = event.element.name raise_on_click(event) diff --git a/evoGUI.lua b/evoGUI.lua index 99192da..09d254d 100644 --- a/evoGUI.lua +++ b/evoGUI.lua @@ -202,7 +202,7 @@ function evogui.create_sensor_display(player) local root = player.gui.top.add{type="frame", name="evogui_root", direction="horizontal", - style="outer_frame"} + style="EvoGUI_outer_frame_no_border"} local action_buttons = root.add{type="flow", name="action_buttons", diff --git a/info.json b/info.json index 821ceab..ff2a343 100644 --- a/info.json +++ b/info.json @@ -1,11 +1,11 @@ { "name": "{{MOD_NAME}}", "version": "{{VERSION}}", - "factorio_version": "0.16", + "factorio_version": "0.17", "title": "EvoGUI - Evolution Factor Indicator and more", "author": "Octav \"narc\" Sandulescu", "contact": "factorio-mods@narc.ro", "homepage": "https://github.com/narc0tiq/evoGUI/", "description": "Places some indicators on your UI for various little statistics that are nice to have.", - "dependencies": ["base >= 0.16.1", "? moweather"] + "dependencies": ["base >= 0.17", "? moweather"] } diff --git a/prototypes/styles.lua b/prototypes/styles.lua index c6445bc..ad227c5 100644 --- a/prototypes/styles.lua +++ b/prototypes/styles.lua @@ -2,24 +2,20 @@ local default_gui = data.raw["gui-style"].default local function button_graphics(xpos, ypos) return { - type = "monolith", - - top_monolith_border = 0, - right_monolith_border = 0, - bottom_monolith_border = 0, - left_monolith_border = 0, - - monolith_image = { - filename = "__{{MOD_NAME}}__/graphics/gui.png", - priority = "extra-high-no-scale", - width = 16, - height = 16, - x = xpos, - y = ypos, - }, + filename = "__{{MOD_NAME}}__/graphics/gui.png", + priority = "extra-high-no-scale", + width = 16, + height = 16, + x = xpos, + y = ypos } end +default_gui.EvoGUI_outer_frame_no_border = { + type = "frame_style", + parent = "outer_frame", + graphical_set = {} +} default_gui.EvoGUI_button_with_icon = { type = "button_style", diff --git a/settingsGUI.lua b/settingsGUI.lua index feb7631..a45aaa5 100644 --- a/settingsGUI.lua +++ b/settingsGUI.lua @@ -114,7 +114,7 @@ function evogui.evoGUI_settings(event) local update_freq_flow = core_settings.add{type="flow", name="update_freq_flow", direction="horizontal"} update_freq_flow.add{type="label", caption={"settings.core_settings.update_freq_left"}} - local textfield = update_freq_flow.add{type="textfield", name="textfield", style="number_textfield"} + local textfield = update_freq_flow.add{type="textfield", name="textfield", style="short_number_textfield"} textfield.text=tostring(global.settings.update_delay) update_freq_flow.add{type="label", caption={"settings.core_settings.update_freq_right"}}