GitHub/alt-tab-macos
1
0
Fork 0
mirror of https://github.com/lwouis/alt-tab-macos.git synced 2026-05-24 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: display windows partially on screen correctly (closes #727)

Browse Source
This commit is contained in:
Louis Pontoise
2021-01-26 00:01:55 +09:00
committed by lwouis
parent 2447140146
commit 2f92936848
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/Spaces.swift
+5 -5
View File
@@ -2,7 +2,7 @@ import Cocoa
class Spaces {
static var currentSpaceId = CGSSpaceID(1)
static var visibleSpaceIds = [CGSSpaceID]()
static var screenToVisibleSpaceMap = [ScreenUuid: CGSSpaceID]()
static var currentSpaceIndex = SpaceIndex(1)
static var isSingleSpace = true
static var idsAndIndexes: [(CGSSpaceID, SpaceIndex)] = allIdsAndIndexes()
@@ -14,7 +14,7 @@ class Spaces {
updateCurrentSpace()
refreshVisibleSpaces()
})
NSWorkspace.shared.notificationCenter.addObserver(forName: NSApplication.didChangeScreenParametersNotification , object: nil, queue: nil, using: { _ in
NSWorkspace.shared.notificationCenter.addObserver(forName: NSApplication.didChangeScreenParametersNotification, object: nil, queue: nil, using: { _ in
debugPrint("OS event", "didChangeScreenParametersNotification")
refreshVisibleSpaces()
})
@@ -29,11 +29,11 @@ class Spaces {
}
static func refreshVisibleSpaces() {
visibleSpaceIds = NSScreen.screens.compactMap {
screenToVisibleSpaceMap.removeAll()
NSScreen.screens.forEach {
if let uuid = $0.uuid() {
return CGSManagedDisplayGetCurrentSpace(cgsMainConnectionId, uuid)
screenToVisibleSpaceMap[uuid] = CGSManagedDisplayGetCurrentSpace(cgsMainConnectionId, uuid)
}
return nil
}
}
src/logic/Windows.swift
+4 -3
View File
@@ -196,17 +196,18 @@ class Windows {
!(!(Preferences.showFullscreenWindows[App.app.shortcutIndex] != .hide) && window.isFullscreen) &&
!(!(Preferences.showMinimizedWindows[App.app.shortcutIndex] != .hide) && window.isMinimized) &&
!(Preferences.spacesToShow[App.app.shortcutIndex] == .active && window.spaceId != Spaces.currentSpaceId) &&
!(Preferences.spacesToShow[App.app.shortcutIndex] == .visible && !Spaces.visibleSpaceIds.contains(window.spaceId)) &&
!(Preferences.spacesToShow[App.app.shortcutIndex] == .visible && !Spaces.screenToVisibleSpaceMap.values.contains(window.spaceId)) &&
!(Preferences.screensToShow[App.app.shortcutIndex] == .showingAltTab && !isOnScreen(window, screen)) &&
(Preferences.showTabsAsWindows || !window.isTabbed))
}
static func isOnScreen(_ window: Window, _ screen: NSScreen) -> Bool {
if let topLeftCorner = window.position, let size = window.size {
if let topLeftCorner = window.position, let size = window.size, let screenUuid = screen.uuid(), let screenSpaceId = Spaces.screenToVisibleSpaceMap[screenUuid] {
var screenFrameInQuartzCoordinates = screen.frame
screenFrameInQuartzCoordinates.origin.y = NSMaxY(NSScreen.screens[0].frame) - NSMaxY(screen.frame)
let windowRect = CGRect(origin: topLeftCorner, size: size)
return windowRect.intersects(screenFrameInQuartzCoordinates)
debugPrint(windowRect.intersects(screenFrameInQuartzCoordinates), screenSpaceId, window.spaceId)
return windowRect.intersects(screenFrameInQuartzCoordinates) && screenSpaceId == window.spaceId
}
return true
}