Merge branch 'master' into ui-olympUI

CelestialCartographers · May 13, 2023 · bcc1058 · bcc1058
2 parents 897646c + fe23773
commit bcc1058
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -86,6 +86,8 @@ Lönn supports a couple of keybinds and special mouse functionality, with more t
  - Left click: Select object
  - Left click existing selection: Cycle through objects under cursor (smallest to largest)
  - Left click & drag: Select multiple objects
+ - Shift + Left click & drag: Add to current selection
+ - Ctrl + A: Select all objects
  - Right click selection: Open properties of selected object(s)
  - Holding Left mouse button over selection: Drag selected objects
  - Shift + Holding Left mouse button over selection: Axis-bound object dragging

diff --git a/src/tools/selection.lua b/src/tools/selection.lua
@@ -1004,14 +1004,15 @@ local function selectionFinished(x, y, fromClick)
     selectionRectangle = false
     selectionCompleted = true
 
+    local doingMouseActions = movementActive or resizeDirection
+
     -- Special case, otherwise we lose some selections
-    if not fromClick and not movementActive and not resizeDirection then
+    if not fromClick and not doingMouseActions then
         updateSelectionTargetsFromPreviews(addModifier)
+        tiles.selectionsChanged(selectionTargets)
 
         selectionPreviews = {}
     end
-
-    tiles.selectionsChanged(selectionTargets)
 end
 
 local function resizeStarted(x, y)