From e6ccff4696973cd6825db8ba8d5dc96e8bba2184 Mon Sep 17 00:00:00 2001 From: Guillaume Broder Date: Tue, 4 Jun 2019 23:50:28 +0200 Subject: [PATCH] :bug: Fix for builtin display - Fixed builtin display check in preferences --- MonitorControl/AppDelegate.swift | 2 +- MonitorControl/Display.swift | 6 ++++-- MonitorControl/Info.plist | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MonitorControl/AppDelegate.swift b/MonitorControl/AppDelegate.swift index 9c5fb01..97b6719 100644 --- a/MonitorControl/AppDelegate.swift +++ b/MonitorControl/AppDelegate.swift @@ -129,7 +129,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { if let edid = ddc?.edid() { let name = Utils.getDisplayName(forEdid: edid) - let display = Display(id, name: name) + let display = Display(id, name: name, isBuiltin: screen.isBuiltin) let monitorSubMenu: NSMenu = asSubMenu ? NSMenu() : self.statusMenu diff --git a/MonitorControl/Display.swift b/MonitorControl/Display.swift index 40a7b42..72e8f02 100644 --- a/MonitorControl/Display.swift +++ b/MonitorControl/Display.swift @@ -6,6 +6,7 @@ import os.log class Display { let identifier: CGDirectDisplayID let name: String + let isBuiltin: Bool var isEnabled: Bool var isMuted: Bool = false var brightnessSliderHandler: SliderHandler? @@ -16,11 +17,12 @@ class Display { private let prefs = UserDefaults.standard private var audioPlayer: AVAudioPlayer? - init(_ identifier: CGDirectDisplayID, name: String, isEnabled: Bool = true) { + init(_ identifier: CGDirectDisplayID, name: String, isBuiltin: Bool, isEnabled: Bool = true) { self.identifier = identifier self.name = name - self.isEnabled = isEnabled + self.isEnabled = isBuiltin ? false : isEnabled self.ddc = DDC(for: identifier) + self.isBuiltin = isBuiltin self.isMuted = self.getValue(for: .audioMuteScreenBlank) == 1 } diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index 27a1efb..a9bbddf 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.5.2 CFBundleVersion - 533 + 560 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion