make autoscroll require holding shift by default

Author: microlith57

Loenn/consts/version.lua

@@ -1 +1 @@
-return require("utils.version_parser")("1.7.0")
+return require("utils.version_parser")("1.7.1")

Loenn/modules/nicer_mouse_pan/device.lua

@@ -1,5 +1,6 @@
 local mods = require("mods")
 local utils = require("utils")
+local keyboardHelper = require("utils.keyboard")
 local configs = require("configs")
 local viewportHandler = require("viewport_handler")
 local drawing = require("utils.drawing")
@@ -38,6 +39,14 @@ local function wrap(s, ds, min, max, mode)
   return 0
 end
 
+local function autoscroll_modifier_pressed()
+  local mod = settings.autoscroll_modifier
+
+  if mod == "" then return true end
+
+  return keyboardHelper.modifierHeld(mod)
+end
+
 ---
 
 function device.mouseclicked(x, y, button, istouched, presses)
@@ -48,7 +57,7 @@ function device.mouseclicked(x, y, button, istouched, presses)
     return true
   end
 
-  if button == autoscrollButton and presses == 1 then
+  if button == autoscrollButton and presses == 1 and autoscroll_modifier_pressed() then
     autoscroll_mode = "click"
     autoscrollX, autoscrollY = x, y
     return true
@@ -61,7 +70,7 @@ function device.mousedragmoved(x, y, dx, dy, button, istouch)
   local autoscrollButton = settings.autoscroll_button
   local viewport = viewportHandler.viewport
 
-  if button == autoscrollButton then
+  if button == autoscrollButton and (autoscroll_mode or autoscroll_modifier_pressed()) then
     if not autoscroll_mode then
       autoscroll_mode = "drag"
       autoscrollX, autoscrollY = x, y

Loenn/modules/nicer_mouse_pan/settings.lua

@@ -12,6 +12,7 @@ handler.defaults = {
   wrap_margin = 25,
   enable_autoscroll = true,
   autoscroll_button = 3,
+  autoscroll_modifier = "shift",
   autoscroll_speed = 20,
   autoscroll_power = 1.3,
   autoscroll_widget_radius = 15,
@@ -69,7 +70,7 @@ function handler.load(settings)
       settings.nicer_mouse_pan[k] = v
     end
 
-    handler[k] = settings.nicer_mouse_pan[k]
+    handler[k] = v
   end
 
   return settings.nicer_mouse_pan._enabled

README.md

@@ -8,7 +8,7 @@ This plugin adds:
 - a tool to **teleport the player** using Everest's DebugRC interface
 - a **coordinate viewer** (<kbd>`</kbd> by default)
 - the ability to **wrap the mouse around the screen when panning**
-- **autoscrolling** (middle mouse by default)
+- **autoscrolling** (shift + middle mouse by default)
 - scripts (for use with [Lönn Scripts](https://gamebanana.com/tools/8050)) to:
   - **copy and paste stylegrounds** using the clipboard, so you can move them between maps, edit them in a text editor, or send them to others;
   - **convert fillers into filler rooms**, for easier editing