From 9a4c673dd7994e46cc7f3768d05519c1411af8ba Mon Sep 17 00:00:00 2001 From: der richter Date: Thu, 14 Mar 2024 00:36:05 +0100 Subject: mac/input: optimise mouse movement enabled check --- osdep/mac/input_helper.swift | 5 +++-- video/out/mac/view.swift | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift index 7b954db2ba..c9891b7a7e 100644 --- a/osdep/mac/input_helper.swift +++ b/osdep/mac/input_helper.swift @@ -139,10 +139,11 @@ class InputHelper: NSObject { } } - func setMouse(position pos: NSPoint) { + func setMouse(position: NSPoint) { + if !mouseEnabled() { return } lock.withLock { guard let input = input else { return } - mp_input_set_mouse_pos(input, Int32(pos.x), Int32(pos.y)) + mp_input_set_mouse_pos(input, Int32(position.x), Int32(position.y)) } } diff --git a/video/out/mac/view.swift b/video/out/mac/view.swift index c001a106ab..3d2cd1c51b 100644 --- a/video/out/mac/view.swift +++ b/video/out/mac/view.swift @@ -132,16 +132,12 @@ class View: NSView, CALayerDelegate { } override func mouseMoved(with event: NSEvent) { - if input?.mouseEnabled() ?? true { - signalMouseMovement(event) - } + signalMouseMovement(event) common.titleBar?.show() } override func mouseDragged(with event: NSEvent) { - if input?.mouseEnabled() ?? true { - signalMouseMovement(event) - } + signalMouseMovement(event) } override func mouseDown(with event: NSEvent) { -- cgit v1.2.3