Re-add entitlements file

Brad Johnson · Brad Johnson · commit 4cbef3eaf041 · 2023-01-05T13:20:02.000-05:00
Delete merge conflict file
Allow MouseHook to run over top of other spaces
diff --git a/MouseHook/AppDelegate.swift b/MouseHook/AppDelegate.swift
@@ -82,6 +82,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         mouseWindow.backgroundColor = .clear
         mouseWindow.level = .screenSaver
         mouseWindow.orderFront(nil)
+        mouseWindow.collectionBehavior = .canJoinAllSpaces
     }
     
     func setupMenu() {
diff --git a/MouseHook/AppDelegate.swift.orig b/MouseHook/AppDelegate.swift.orig
diff --git a/MouseHook/Info.plist b/MouseHook/Info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LSUIElement</key>
+	<true/>
+</dict>
+</plist>
diff --git a/MouseHook/MouseHook.entitlements b/MouseHook/MouseHook.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
+</dict>
+</plist>

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {`
`82`	`82`	`mouseWindow.backgroundColor = .clear`
`83`	`83`	`mouseWindow.level = .screenSaver`
`84`	`84`	`mouseWindow.orderFront(nil)`
	`85`	`+ mouseWindow.collectionBehavior = .canJoinAllSpaces`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`func setupMenu() {`