Removed OSD lock popup completely (MonitorControl#791)

waydabber · web-flow · commit a2203ab2b11c · 2021-11-16T11:56:49.000+01:00
diff --git a/MonitorControl/Support/MediaKeyTapManager.swift b/MonitorControl/Support/MediaKeyTapManager.swift
@@ -21,7 +21,6 @@ class MediaKeyTapManager: MediaKeyTapDelegate {
       return
     }
     guard app.sleepID == 0, app.reconfigureID == 0 else {
-      self.showOSDLock(mediaKey)
       return
     }
     if isPressed, self.handleOpenPrefPane(mediaKey: mediaKey, event: event, modifiers: modifiers) {
@@ -68,15 +67,6 @@ class MediaKeyTapManager: MediaKeyTapDelegate {
     }
   }
 
-  private func showOSDLock(_ mediaKey: MediaKey) {
-    if [.brightnessUp, .brightnessDown].contains(mediaKey) {
-      OSDUtils.showOSDLockOnAllDisplays(osdImage: OSDUtils.OSDImage.brightness.rawValue)
-    }
-    if [.volumeUp, .volumeDown, .mute].contains(mediaKey) {
-      OSDUtils.showOSDLockOnAllDisplays(osdImage: OSDUtils.OSDImage.audioSpeaker.rawValue)
-    }
-  }
-
   private func sendDisplayCommand(mediaKey: MediaKey, isRepeat: Bool, isSmallIncrement: Bool, isPressed: Bool, isContrast: Bool = false) {
     self.sendDisplayCommandVolumeMute(mediaKey: mediaKey, isRepeat: isRepeat, isSmallIncrement: isSmallIncrement, isPressed: isPressed)
     self.sendDisplayCommandBrightnessContrast(mediaKey: mediaKey, isRepeat: isRepeat, isSmallIncrement: isSmallIncrement, isPressed: isPressed, isContrast: isContrast)
diff --git a/MonitorControl/Support/OSDUtils.swift b/MonitorControl/Support/OSDUtils.swift
@@ -74,17 +74,4 @@ class OSDUtils: NSObject {
   static func getDistance(fromNearestChiclet chiclet: Float) -> Float {
     abs(chiclet.rounded(.towardZero) - chiclet)
   }
-
-  static func showOSDLockOnAllDisplays(osdImage: Int64) {
-    var displayCount: UInt32 = 0
-    var onlineDisplays = [CGDirectDisplayID](repeating: 0, count: Int(16))
-    if CGGetOnlineDisplayList(16, &onlineDisplays, &displayCount) == CGError.success {
-      let displayIDs = onlineDisplays.prefix(Int(displayCount))
-      for id in displayIDs {
-        if let manager = OSDManager.sharedManager() as? OSDManager {
-          manager.showImage(osdImage, onDisplayID: id, priority: 0x1F4, msecUntilFade: 1000, filledChiclets: 0, totalChiclets: 100, locked: true)
-        }
-      }
-    }
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ class MediaKeyTapManager: MediaKeyTapDelegate {`
`21`	`21`	`return`
`22`	`22`	`}`
`23`	`23`	`guard app.sleepID == 0, app.reconfigureID == 0 else {`
`24`		`- self.showOSDLock(mediaKey)`
`25`	`24`	`return`
`26`	`25`	`}`
`27`	`26`	`if isPressed, self.handleOpenPrefPane(mediaKey: mediaKey, event: event, modifiers: modifiers) {`
`@@ -68,15 +67,6 @@ class MediaKeyTapManager: MediaKeyTapDelegate {`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`
`71`		`- private func showOSDLock(_ mediaKey: MediaKey) {`
`72`		`- if [.brightnessUp, .brightnessDown].contains(mediaKey) {`
`73`		`- OSDUtils.showOSDLockOnAllDisplays(osdImage: OSDUtils.OSDImage.brightness.rawValue)`
`74`		`- }`
`75`		`- if [.volumeUp, .volumeDown, .mute].contains(mediaKey) {`
`76`		`- OSDUtils.showOSDLockOnAllDisplays(osdImage: OSDUtils.OSDImage.audioSpeaker.rawValue)`
`77`		`- }`
`78`		`- }`
`79`		`-`
`80`	`70`	`private func sendDisplayCommand(mediaKey: MediaKey, isRepeat: Bool, isSmallIncrement: Bool, isPressed: Bool, isContrast: Bool = false) {`
`81`	`71`	`self.sendDisplayCommandVolumeMute(mediaKey: mediaKey, isRepeat: isRepeat, isSmallIncrement: isSmallIncrement, isPressed: isPressed)`
`82`	`72`	`self.sendDisplayCommandBrightnessContrast(mediaKey: mediaKey, isRepeat: isRepeat, isSmallIncrement: isSmallIncrement, isPressed: isPressed, isContrast: isContrast)`