Translate selected frame

VODGroup · Mar 8, 2024 · cae6e29 · cae6e29
1 parent 282f2d6
commit cae6e29
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Shared/Sources/Canvas/Drawing/DrawingController.swift b/Shared/Sources/Canvas/Drawing/DrawingController.swift
@@ -179,6 +179,9 @@ public class DrawingController {
             if let corner = view.hud.corner(for: location) {
                 startResizing(control: selectedControl, startLocation: location, corner: corner)
                 return
+            } else if let frame = selectedControl as? ImageLayer {
+                startDragging(control: frame, startLocation: location)
+                return
             }
         }
 
@@ -198,7 +201,9 @@ public class DrawingController {
             return
         }
 
-        if view.control(at: location) != nil {
+        let hasElementUnderCursor = view.control(at: location) != nil
+        let isFrameSelected = selectedControl is ImageLayer
+        if hasElementUnderCursor || isFrameSelected {
             pointerSubject.send(view.copyListener.isModifierActive ? .copy : .hover)
         } else {
             pointerSubject.send(nil)

diff --git a/Shared/Sources/Canvas/Drawing/DrawingView.swift b/Shared/Sources/Canvas/Drawing/DrawingView.swift
@@ -117,8 +117,6 @@ public extension DrawingView {
         // TODO: Refactor
         let viewsUnderCoordinate = drawnControls.filter({ control in
             control.model!.frame.contains(coordinate)
-        }) + frames.filter({ control in
-            control.model!.frame.contains(coordinate)
         })
 
         switch viewsUnderCoordinate.count {

diff --git a/VoiceOver Designer/Features/Tests/CanvasAppKitTests/NewDrawingTests.swift b/VoiceOver Designer/Features/Tests/CanvasAppKitTests/NewDrawingTests.swift
@@ -69,6 +69,7 @@ class NewDrawingTests: CanvasAfterDidLoadTests {
     // MARK: - Artboard
     func test_frameOnScreen_whenAddElementInsideFrame_shouldAddElementToFrame() throws {
         addFrame()
+        sut.deselect()
         XCTAssertNotNil(document.artboard.frames.first)
 
         sut.mouseDown(on: start10)

diff --git a/VoiceOver Designer/Features/Tests/CanvasAppKitTests/RoutingTests.swift b/VoiceOver Designer/Features/Tests/CanvasAppKitTests/RoutingTests.swift
@@ -1,6 +1,7 @@
 import XCTest
 @testable import Canvas
 
+@MainActor
 class RoutingTests: CanvasAfterDidLoadTests {
 
     func test_openSettings() async throws {