update for lönn 0.8.0

Author: microlith57

Loenn/consts/loenn_version.lua

@@ -1 +1 @@
-return require("utils.version_parser")("0.7.7")
+return require("utils.version_parser")("0.8.0")

Loenn/libraries/modules.lua

@@ -1,6 +1,6 @@
 local modules = {
   { name = "coords_view" },
-  { name = "texture_browser" },
+  -- { name = "texture_browser" },
   { name = "keyboard_pan" },
   { name = "room_mover" },
   { name = "snap_to_grid" },

Loenn/libraries/settings.lua

@@ -4,7 +4,6 @@ local config = require("utils.config")
 local logging = require("logging")
 
 local currentVersion = mods.requireFromPlugin("consts.version")
-local alp_utils = mods.requireFromPlugin("libraries.utils")
 
 ---
 

Loenn/libraries/utils.lua

@@ -1,9 +1,5 @@
 local utils = require("utils")
 
-local hotkeyStruct = require("structs.hotkey")
-local standardHotkeys = require("standard_hotkeys")
-local hotkeyHandler = require("hotkey_handler")
-
 ---
 
 local alp_utils = {}
@@ -75,11 +71,4 @@ end
 
 ---
 
-function alp_utils.addHotkey(activator, callback)
-  local hotkey = hotkeyStruct.createHotkey(activator, callback)
-  hotkeyHandler.registerHotkey(hotkey, standardHotkeys)
-end
-
----
-
 return alp_utils

Loenn/modules/coords_view/device.lua

@@ -6,8 +6,7 @@ local loadedState = require("loaded_state")
 local ui = require("ui")
 local uie = require("ui.elements")
 
-local hotkeys = require("standard_hotkeys")
-local hotkeyStruct = require("structs.hotkey")
+local hotkeyHandler = require("hotkey_handler")
 
 local settings = mods.requireFromPlugin("modules.coords_view.settings")
 
@@ -103,7 +102,7 @@ end
 
 ---
 
-table.insert(hotkeys, hotkeyStruct.createHotkey(settings.hotkey, function() device.coordsWindow.toggle() end))
+hotkeyHandler.addHotkey("global", settings.hotkey, function() device.coordsWindow.toggle() end)
 
 ---
 

Loenn/modules/coords_view/window.lua

@@ -64,6 +64,7 @@ function coordsWindow.open()
   window.titlebar.style.padding = 4
 
   windowPersister.trackWindow(windowPersisterName, window)
+  widgetUtils.preventOutOfBoundsMovement(window)
 
   coordsWindow.group.parent:addChild(window)
   coordsWindow.group:reflow()

Loenn/modules/keyboard_pan/device.lua

@@ -3,7 +3,7 @@ local mods = require("mods")
 local viewportHandler = require("viewport_handler")
 local ui = require("ui.main")
 
-local hotkeys = require("standard_hotkeys")
+local hotkeyHandler = require("hotkey_handler")
 local hotkeyStruct = require("structs.hotkey")
 
 local settings = mods.requireFromPlugin("modules.keyboard_pan.settings")
@@ -43,15 +43,10 @@ end
 
 local function callback() end
 
-keys.left  = hotkeyStruct.createHotkey(settings.hotkey_left, callback)
-keys.right = hotkeyStruct.createHotkey(settings.hotkey_right, callback)
-keys.up    = hotkeyStruct.createHotkey(settings.hotkey_up, callback)
-keys.down  = hotkeyStruct.createHotkey(settings.hotkey_down, callback)
-
-table.insert(hotkeys, keys.left)
-table.insert(hotkeys, keys.right)
-table.insert(hotkeys, keys.up)
-table.insert(hotkeys, keys.down)
+keys.left  = hotkeyHandler.addHotkey("global", settings.hotkey_left, callback)
+keys.right = hotkeyHandler.addHotkey("global", settings.hotkey_right, callback)
+keys.up    = hotkeyHandler.addHotkey("global", settings.hotkey_up, callback)
+keys.down  = hotkeyHandler.addHotkey("global", settings.hotkey_down, callback)
 
 ---
 

Loenn/modules/snap_to_grid/device.lua

@@ -12,7 +12,8 @@ local tools = require("tools")
 local toolUtils = require("tool_utils")
 local selectionItemUtils = require("selection_item_utils")
 
-local alp_utils = mods.requireFromPlugin("libraries.utils")
+local hotkeyHandler = require("hotkey_handler")
+
 local selections = mods.requireFromPlugin("libraries.selection")
 
 ---
@@ -292,12 +293,12 @@ end
 
 ---
 
-local hotkey_left    = alp_utils.addHotkey(settings.hotkey_left, snapLeft)
-local hotkey_right   = alp_utils.addHotkey(settings.hotkey_right, snapRight)
-local hotkey_up      = alp_utils.addHotkey(settings.hotkey_up, snapUp)
-local hotkey_down    = alp_utils.addHotkey(settings.hotkey_down, snapDown)
-local hotkey_neutral = alp_utils.addHotkey(settings.hotkey_neutral, snapNeutral)
-local hotkey_grid    = alp_utils.addHotkey(settings.hotkey_grid, toggle_grid)
+local hotkey_left    = hotkeyHandler.addHotkey("global", settings.hotkey_left, snapLeft)
+local hotkey_right   = hotkeyHandler.addHotkey("global", settings.hotkey_right, snapRight)
+local hotkey_up      = hotkeyHandler.addHotkey("global", settings.hotkey_up, snapUp)
+local hotkey_down    = hotkeyHandler.addHotkey("global", settings.hotkey_down, snapDown)
+local hotkey_neutral = hotkeyHandler.addHotkey("global", settings.hotkey_neutral, snapNeutral)
+local hotkey_grid    = hotkeyHandler.addHotkey("global", settings.hotkey_grid, toggle_grid)
 
 ---
 

README.md

@@ -19,6 +19,6 @@ It also supports the following experimental add-ons, which you should **only put
 
 These features can be configured; see [the wiki](https://github.com/microlith57/AnotherLoennPlugin/wiki) for information.
 
-Note that this will intentionally stop working for newer Lönn (major) versions than it is updated for (currently v0.7.7, so it won't work for v0.8.x), to make sure it doesn't break things.
+Note that this will intentionally stop working for newer Lönn (major) versions than it is updated for (currently v0.8.x, so it won't work for v0.9.x), to make sure it doesn't break things.
 
 Some code in this repository is derived from [Lönn](https://github.com/CelestialCartographers/Loenn) under the MIT License.