Mirrors/touch-bar-simulator
2
0
Fork 0
mirror of https://github.com/sindresorhus/touch-bar-simulator synced 2025-02-17 13:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto-adjust docked position to match available screen space (#39)

Browse source
This commit is contained in:
ThatsJustCheesy 2019-07-04 11:30:12 -04:00 • committed by Sindre Sorhus
parent 71785b3d85
commit c184ba5cc5
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Touch Bar Simulator.xcodeproj/project.pbxproj
View file

@ -184,7 +184,6 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = E3FE2CB61E726CE800C6713A;

19
Touch Bar Simulator/TouchBarWindow.swift
View file

@ -9,14 +9,22 @@ final class TouchBarWindow: NSPanel {
switch self {
case .floating:
window.addTitlebar()
case .dockedToTop:
window.removeTitlebar()
case .dockedToBottom:
window.removeTitlebar()
}
reposition(window: window)
}
func reposition(window: NSWindow) {
switch self {
case .floating:
if let prevPosition = defaults[.lastFloatingPosition] {
window.setFrameOrigin(prevPosition)
}
case .dockedToTop:
window.removeTitlebar()
window.moveTo(x: .center, y: .top)
case .dockedToBottom:
window.removeTitlebar()
window.moveTo(x: .center, y: .bottom)
}
}
@ -50,6 +58,11 @@ final class TouchBarWindow: NSPanel {
}
}
@objc
func didChangeScreenParameters(_ notification: Notification) {
docking.reposition(window: self)
}
var showOnAllDesktops: Bool = false {
didSet {
if showOnAllDesktops {
@ -350,6 +363,8 @@ final class TouchBarWindow: NSPanel {
if !dockBehavior {
orderFront(nil)
}
NotificationCenter.default.addObserver(self, selector: #selector(didChangeScreenParameters(_:)), name: NSApplication.didChangeScreenParametersNotification, object: nil)
}
deinit {

9
Touch Bar Simulator/util.swift
View file

@ -57,9 +57,10 @@ extension NSWindow {
}
func moveTo(x xPositioning: MoveXPositioning, y yPositioning: MoveYPositioning) {
guard let visibleFrame = NSScreen.main?.visibleFrame else {
guard let screen = NSScreen.main else {
return
}
let visibleFrame = screen.visibleFrame
let x: CGFloat, y: CGFloat
switch xPositioning {
@ -72,7 +73,11 @@ extension NSWindow {
}
switch yPositioning {
case .top:
y = visibleFrame.maxY - frame.height
// Defect fix: keep docked windows below menubar area
// Previously, the window would obstruct menubar clicks when the menubar was set to auto-hide.
// Now, the window stays below that area.
let menubarThickness = NSStatusBar.system.thickness
y = min(visibleFrame.maxY - frame.height, screen.frame.maxY - menubarThickness - frame.height)
case .center:
y = visibleFrame.midY - frame.height / 2
case .bottom: