KofTwentyTwo/CommandTabFree
2
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

fix: using floor() everywhere to avoid blurry rendering

Browse Source
This commit is contained in:
louis.pontoise authored and lwouis committed 2020-03-10 14:00:37 +09:00
1 parent e588d55ecd
commit 2a36196661
2 files changed
+16 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

alt-tab-macos/ui/Cell.swift
+12 -7
View File
@@ -109,31 +109,36 @@ class Cell: NSCollectionViewItem {
}
static func widthMax(_ screen: NSScreen) -> CGFloat {
return (ThumbnailsPanel.widthMax(screen) / Preferences.minCellsPerRow - Preferences.cellPadding) * Cell.downscaleFactor()
return floor((ThumbnailsPanel.widthMax(screen) / Preferences.minCellsPerRow - Preferences.cellPadding) * Cell.downscaleFactor())
}
static func widthMin(_ screen: NSScreen) -> CGFloat {
return (ThumbnailsPanel.widthMax(screen) / Preferences.maxCellsPerRow - Preferences.cellPadding) * Cell.downscaleFactor()
return floor((ThumbnailsPanel.widthMax(screen) / Preferences.maxCellsPerRow - Preferences.cellPadding) * Cell.downscaleFactor())
}
static func height(_ screen: NSScreen) -> CGFloat {
return (ThumbnailsPanel.heightMax(screen) / Preferences.nCellsRows - Preferences.cellPadding) * Cell.downscaleFactor()
return floor((ThumbnailsPanel.heightMax(screen) / Preferences.nCellsRows - Preferences.cellPadding) * Cell.downscaleFactor())
}
static func width(_ image: NSImage?, _ screen: NSScreen) -> CGFloat {
return max(thumbnailSize(image, screen).width + Preferences.cellPadding * 2, ThumbnailsPanel.widthMin(screen))
return floor(max(thumbnailSize(image, screen).width + Preferences.cellPadding * 2, ThumbnailsPanel.widthMin(screen)))
}
static func thumbnailSize(_ image: NSImage?, _ screen: NSScreen) -> NSSize {
let (width, height) = thumbnailSize_(image, screen)
return NSSize(width: floor(width), height: floor(height))
}
static func thumbnailSize_(_ image: NSImage?, _ screen: NSScreen) -> (CGFloat, CGFloat) {
let thumbnailWidthMin = Cell.widthMin(screen) - Preferences.cellPadding * 2
let thumbnailHeightMax = Cell.height(screen) - Preferences.cellPadding * 3 - Preferences.iconSize
let thumbnailWidthMax = Cell.widthMax(screen) - Preferences.cellPadding * 2
guard let image = image else { return NSSize(width: thumbnailWidthMin, height: thumbnailHeightMax) }
guard let image = image else { return (thumbnailWidthMin, thumbnailHeightMax) }
let imageRatio = image.size.width / image.size.height
let thumbnailRatio = thumbnailWidthMax / thumbnailHeightMax
if thumbnailRatio > imageRatio {
return NSSize(width: image.size.width * thumbnailHeightMax / image.size.height, height: thumbnailHeightMax)
return (image.size.width * thumbnailHeightMax / image.size.height, thumbnailHeightMax)
}
return NSSize(width: thumbnailWidthMax, height: image.size.height * thumbnailWidthMax / image.size.width)
return (thumbnailWidthMax, image.size.height * thumbnailWidthMax / image.size.width)
}
}
alt-tab-macos/ui/ThumbnailsPanel.swift
+4 -4
View File
@@ -96,18 +96,18 @@ class ThumbnailsPanel: NSPanel, NSCollectionViewDataSource, NSCollectionViewDele
}
static func widthMax(_ screen: NSScreen) -> CGFloat {
return screen.frame.width * Preferences.maxScreenUsage - Preferences.windowPadding * 2
return floor(screen.frame.width * Preferences.maxScreenUsage - Preferences.windowPadding * 2)
}
static func heightMax(_ screen: NSScreen) -> CGFloat {
return screen.frame.height * Preferences.maxScreenUsage - Preferences.windowPadding * 2
return floor(screen.frame.height * Preferences.maxScreenUsage - Preferences.windowPadding * 2)
}
static func widthMin(_ screen: NSScreen) -> CGFloat {
return Cell.widthMin(screen) - Preferences.windowPadding * 2
return floor(Cell.widthMin(screen) - Preferences.windowPadding * 2)
}
static func heightMin(_ screen: NSScreen) -> CGFloat {
return Cell.height(screen) - Preferences.windowPadding * 2
return floor(Cell.height(screen) - Preferences.windowPadding * 2)
}
}