From 286b18f633b02e52732a5ddc5a41d393b40a39a1 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Fri, 25 Oct 2019 18:15:20 -0700 Subject: [PATCH] Adjusted height! --- Clocker/Panel/ParentPanelController.swift | 2 +- Clocker/Panel/UI/TimezoneCellView.swift | 4 ++-- Clocker/Panel/UI/TimezoneDataSource.swift | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index 3d24abd..5d490b1 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -396,7 +396,7 @@ class ParentPanelController: NSWindowController { } if let userFontSize = DataStore.shared().retrieve(key: CLUserFontSizePreference) as? NSNumber { - scrollViewHeight.constant = totalHeight + CGFloat(userFontSize.intValue * 3) + 5.0 + scrollViewHeight.constant = totalHeight + CGFloat(userFontSize.intValue * 2) + 5.0 } if DataStore.shared().shouldDisplay(ViewType.upcomingEventView) { diff --git a/Clocker/Panel/UI/TimezoneCellView.swift b/Clocker/Panel/UI/TimezoneCellView.swift index 0ce0dac..b381aae 100644 --- a/Clocker/Panel/UI/TimezoneCellView.swift +++ b/Clocker/Panel/UI/TimezoneCellView.swift @@ -86,8 +86,8 @@ class TimezoneCellView: NSTableCellView { return } - let newFontSize = CGFloat(13 + (userFontSize.intValue * 2)) - let newTimeFontSize = CGFloat(13 + (userFontSize.intValue * 3)) + let newFontSize = CGFloat(13 + (userFontSize.intValue * 1)) + let newTimeFontSize = CGFloat(13 + (userFontSize.intValue * 2)) let fontManager = NSFontManager.shared diff --git a/Clocker/Panel/UI/TimezoneDataSource.swift b/Clocker/Panel/UI/TimezoneDataSource.swift index 450a06d..eb9f7bd 100644 --- a/Clocker/Panel/UI/TimezoneDataSource.swift +++ b/Clocker/Panel/UI/TimezoneDataSource.swift @@ -79,10 +79,10 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate { let model = timezones[row] if let note = model.note, !note.isEmpty { - return CGFloat(65 + userFontSize.floatValue + 30) + return CGFloat(65 + userFontSize.floatValue + 25) } - return CGFloat(65 + (userFontSize.intValue * 3)) + return CGFloat(65 + (userFontSize.intValue * 2)) } return 0