From 94352723aa202ea523ac9f192eda72f906ccfbca Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Sat, 31 Aug 2024 18:09:41 +0200 Subject: [PATCH] fix: fixed MacBookPro16,4 year, fixed negative height for the disk popup --- Kit/plugins/SystemKit.swift | 2 +- Modules/Disk/popup.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kit/plugins/SystemKit.swift b/Kit/plugins/SystemKit.swift index 2f0b5bc6..52040aab 100644 --- a/Kit/plugins/SystemKit.swift +++ b/Kit/plugins/SystemKit.swift @@ -598,7 +598,7 @@ let deviceDict: [String: model_s] = [ "MacBookPro16,1": model_s(name: "MacBook Pro 16\"", year: 2019, type: .macbookPro), "MacBookPro16,2": model_s(name: "MacBook Pro 13\"", year: 2019, type: .macbookPro), "MacBookPro16,3": model_s(name: "MacBook Pro 13\"", year: 2020, type: .macbookPro), - "MacBookPro16,4": model_s(name: "MacBook Pro 16\"", year: 2020, type: .macbookPro), + "MacBookPro16,4": model_s(name: "MacBook Pro 16\"", year: 2019, type: .macbookPro), "MacBookPro17,1": model_s(name: "MacBook Pro 13\" (M1)", year: 2020, type: .macbookPro), "MacBookPro18,1": model_s(name: "MacBook Pro 16\" (M1 Pro)", year: 2021, type: .macbookPro), "MacBookPro18,2": model_s(name: "MacBook Pro 16\" (M1 Max)", year: 2021, type: .macbookPro), diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift index 3e0730c1..3ba15c70 100644 --- a/Modules/Disk/popup.swift +++ b/Modules/Disk/popup.swift @@ -69,7 +69,7 @@ internal class Popup: PopupWrapper { var h: CGFloat = 0 h += self.disks.subviews.map({ $0.frame.height + self.disks.spacing }).reduce(0, +) - self.disks.spacing h += self.processesHeight - if self.frame.size.height != h { + if h > 0 && self.frame.size.height != h { self.setFrameSize(NSSize(width: self.frame.width, height: h)) self.sizeCallback?(self.frame.size) }