summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-03-08 21:24:07 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-11 22:44:26 -0700
commit4485e205b95546f9f3cac6c9c337a6c4b4d8806c (patch)
tree0cb844700c7ac0a219e00641c0c625faa1b8c782
parentb0da883b1311fb6db13a263cf4915fbf1ea27b1a (diff)
downloadmpv-4485e205b95546f9f3cac6c9c337a6c4b4d8806c.tar.bz2
mpv-4485e205b95546f9f3cac6c9c337a6c4b4d8806c.tar.xz
cocoa-cb: don't deactivate mouse events completely with input-cursor=no
mouse events and the tracking area are needed for (un)hiding the new title bar, which was broken when input-cursor=no was set. no tracking area was ever created and set which completely deactivated any mouse events. the specific mouse event functions were already deactivated proactively and have the needed check. no events are being propagated to the mpv core when input-cursor=no is set, even with an active tracking area.
-rw-r--r--video/out/cocoa-cb/events_view.swift9
1 files changed, 2 insertions, 7 deletions
diff --git a/video/out/cocoa-cb/events_view.swift b/video/out/cocoa-cb/events_view.swift
index 729a26263e..7cc6a4022d 100644
--- a/video/out/cocoa-cb/events_view.swift
+++ b/video/out/cocoa-cb/events_view.swift
@@ -48,10 +48,6 @@ class EventsView: NSView {
removeTrackingArea(tracker!)
}
- if mpv != nil && !mpv.getBoolProperty("input-cursor") {
- return
- }
-
tracker = NSTrackingArea(rect: bounds,
options: [.activeAlways, .mouseEnteredAndExited, .mouseMoved, .enabledDuringMouseDrag],
owner: self, userInfo: nil)
@@ -88,12 +84,11 @@ class EventsView: NSView {
}
override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
- return mpv.getBoolProperty("input-cursor")
+ return true
}
override func becomeFirstResponder() -> Bool {
- return mpv.getBoolProperty("input-cursor") ||
- mpv.getBoolProperty("input-vo-keyboard")
+ return true
}
override func resignFirstResponder() -> Bool {