fix: fixed MacBookPro16,4 year, fixed negative height for the disk popup

exelban · Aug 31, 2024 · 9435272 · 9435272
1 parent d76ff86
commit 9435272
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)
  }