morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: adjusted popup height for MacBook with a screen less than 15"

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2023-08-08 21:16:22 +02:00
parent cd95c2cacd
commit e9f4ab9a43
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Kit/module/popup.swift
View File

@@ -197,14 +197,30 @@ internal class PopupView: NSView {
public func setView(_ view: Popup_p?) {
self.view = view
let width: CGFloat = (view?.frame.width ?? Constants.Popup.width) + (Constants.Popup.margins*2)
let height: CGFloat = (view?.frame.height ?? 0) + Constants.Popup.headerHeight + (Constants.Popup.margins*2)
var isScrollVisible: Bool = false
var size: NSSize = NSSize(
width: (view?.frame.width ?? Constants.Popup.width) + (Constants.Popup.margins*2),
height: (view?.frame.height ?? 0) + Constants.Popup.headerHeight + (Constants.Popup.margins*2)
)
self.setFrameSize(NSSize(width: width, height: height))
self.foreground.setFrameSize(NSSize(width: width, height: height))
self.background.setFrameSize(NSSize(width: width, height: height))
self.header.setFrameOrigin(NSPoint(x: 0, y: height - Constants.Popup.headerHeight))
self.body.setFrameSize(NSSize(width: (view?.frame.width ?? Constants.Popup.width), height: (view?.frame.height ?? 0)))
self.windowHeight = NSScreen.main?.visibleFrame.height // for height recalculate when appear/disappear
self.containerHeight = self.body.documentView?.frame.height // for scroll diff calculation
if let screenHeight = NSScreen.main?.visibleFrame.height, size.height > screenHeight {
size.height = screenHeight - Constants.Widget.height
isScrollVisible = true
}
if let screenWidth = NSScreen.main?.visibleFrame.width, size.width > screenWidth {
size.width = screenWidth
}
self.setFrameSize(size)
self.foreground.setFrameSize(size)
self.background.setFrameSize(size)
self.body.setFrameSize(NSSize(
width: size.width - (Constants.Popup.margins*2) + (isScrollVisible ? 20 : 0),
height: size.height - Constants.Popup.headerHeight - (Constants.Popup.margins*2)
))
self.header.setFrameOrigin(NSPoint(x: 0, y: size.height - Constants.Popup.headerHeight))
if let view = view {
self.body.documentView = view