Skip to content

Various fixes and improvements for v4.0.1 #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waydabber merged 21 commits into from
Nov 4, 2021
Merged

Various fixes and improvements for v4.0.1 #769

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3ccd9a4
Unofficial support for 10.14
waydabber Nov 2, 2021
b4e9b2e
Updated readme
waydabber Nov 2, 2021
4aea8a1
Updated readme
waydabber Nov 2, 2021
0e5d649
Updated code for compatibility with 10.14
waydabber Nov 2, 2021
00dc8ff
Update .swiftlint.yml
waydabber Nov 3, 2021
057b8e1
Update README.md
waydabber Nov 3, 2021
c8f3337
Working on fixes
waydabber Nov 3, 2021
3ce3fac
Merge remote-tracking branch 'refs/remotes/origin/fixes'
waydabber Nov 3, 2021
f90e208
Async DDC write + much smoother DDC sliders
waydabber Nov 3, 2021
7ff0ebf
Made async stuff thread safe...
waydabber Nov 3, 2021
e3b79b8
Identify points to fix for virtual-virtual mirror shading scenario
waydabber Nov 3, 2021
3a4f8ac
Better support for virtual->virtual and dummy->virtual scenarios (nee…
waydabber Nov 3, 2021
8c00f8d
Fixed display reset settings disabling Use hardware DDC
waydabber Nov 3, 2021
d087ada
Fixed custom control codes on Intel
waydabber Nov 4, 2021
4e49ceb
Further improvement in Dummy and Mirrored virtual display scenario
waydabber Nov 4, 2021
1e21063
Better support for dummies, hide them from menu
waydabber Nov 4, 2021
5ff66e2
Further improved support for dummies
waydabber Nov 4, 2021
1d8c1c2
Update readme
waydabber Nov 4, 2021
603aed3
Fix black background upon space change with shade dimming
waydabber Nov 4, 2021
aed8b6a
Fix signing
waydabber Nov 4, 2021
f8f2d5e
Update MenuHandler.swift
waydabber Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Further improved support for dummies
  • Loading branch information
@waydabber
waydabber committed Nov 4, 2021
commit 5ff66e2a0d8adf6b56657663b3c08e6ba1719aa3
2 changes: 1 addition & 1 deletion MonitorControl/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>6928</string>
<string>6934</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
9 changes: 6 additions & 3 deletions MonitorControl/Support/MenuHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@ class MenuHandler: NSMenu, NSMenuDelegate {
displays.append(contentsOf: DisplayManager.shared.getOtherDisplays())
let relevant = prefs.integer(forKey: PrefKey.multiSliders.rawValue) == MultiSliders.relevant.rawValue
let combine = prefs.integer(forKey: PrefKey.multiSliders.rawValue) == MultiSliders.combine.rawValue
let numOfDisplays = displays.count
var numOfDisplays = 0
for display in displays {
numOfDisplays += display.isDummy ? 0 : 1
}
Comment thread
waydabber marked this conversation as resolved.
Outdated
if numOfDisplays != 0 {
let asSubMenu: Bool = (displays.count > 3 && !relevant && !combine && app.macOS10()) ? true : false
var iterator = 0
for display in displays where !relevant || DisplayManager.resolveEffectiveDisplayID(display.identifier) == DisplayManager.resolveEffectiveDisplayID(currentDisplay!.identifier) {
for display in displays where (!relevant || DisplayManager.resolveEffectiveDisplayID(display.identifier) == DisplayManager.resolveEffectiveDisplayID(currentDisplay!.identifier)) && !display.isDummy {
iterator += 1
if !relevant, !combine, iterator != 1, app.macOS10() {
self.insertItem(NSMenuItem.separator(), at: 0)
Expand Down Expand Up @@ -177,7 +180,7 @@ class MenuHandler: NSMenu, NSMenuDelegate {
let title = NSLocalizedString("Brightness", comment: "Shown in menu")
addedSliderHandlers.append(self.setupMenuSliderHandler(command: .brightness, display: display, title: title))
}
if prefs.integer(forKey: PrefKey.multiSliders.rawValue) != MultiSliders.combine.rawValue, !(display.isDummy) {
if prefs.integer(forKey: PrefKey.multiSliders.rawValue) != MultiSliders.combine.rawValue {
self.addDisplayMenuBlock(addedSliderHandlers: addedSliderHandlers, blockName: display.readPrefAsString(key: .friendlyName) != "" ? display.readPrefAsString(key: .friendlyName) : display.name, monitorSubMenu: monitorSubMenu, numOfDisplays: numOfDisplays, asSubMenu: asSubMenu)
}
if addedSliderHandlers.count > 0, prefs.integer(forKey: PrefKey.menuIcon.rawValue) == MenuIcon.sliderOnly.rawValue {
Expand Down
2 changes: 1 addition & 1 deletion MonitorControlHelper/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>6928</string>
<string>6934</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSBackgroundOnly</key>
Expand Down