From c199201cb90f9dd5bb90d133d9a9b30209fa4bf3 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Tue, 14 Jul 2020 14:23:11 -0500 Subject: [PATCH] Commenting out 11.0 changes. --- .../OnboardingParentViewController.swift | 4 ++-- Clocker/Overall App/Themer.swift | 14 ++++++++------ Clocker/Panel/Notes Popover/NotesPopover.swift | 6 +++--- Clocker/Panel/ParentPanelController.swift | 10 +++++----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Clocker/Onboarding/OnboardingParentViewController.swift b/Clocker/Onboarding/OnboardingParentViewController.swift index 68457db..d191e2f 100644 --- a/Clocker/Onboarding/OnboardingParentViewController.swift +++ b/Clocker/Onboarding/OnboardingParentViewController.swift @@ -69,8 +69,8 @@ class OnboardingParentViewController: NSViewController { [negativeButton, backButton].forEach { $0?.isHidden = true } if #available(OSX 10.16, *) { - negativeButton.controlSize = .large - positiveButton.controlSize = .large +// negativeButton.controlSize = .large +// positiveButton.controlSize = .large backButton.image = Themer.shared().symbolImage(for: "chevron.left.circle.fill") backButton.bezelStyle = .recessed backButton.isBordered = false diff --git a/Clocker/Overall App/Themer.swift b/Clocker/Overall App/Themer.swift index 2b7fd9c..3d8e639 100644 --- a/Clocker/Overall App/Themer.swift +++ b/Clocker/Overall App/Themer.swift @@ -448,11 +448,13 @@ extension Themer { func symbolImage(for name: String) -> NSImage { assert(name.count > 0) - if #available(OSX 10.16, *) { - return NSImage(systemSymbolName: name, accessibilityDescription: name)! - } else { - // Dummy image for older xcodes - return NSImage(named: NSImage.Name("Calendar Tab Icon"))! - } + return NSImage(named: NSImage.Name("Calendar Tab Icon"))! +// if #available(OSX 10.16, *) { +// return NSImage(systemSymbolName: name, +// accessibilityDescription: name)! +// } else { +// // Dummy image for older xcodes +// return NSImage(named: NSImage.Name("Calendar Tab Icon"))! +// } } } diff --git a/Clocker/Panel/Notes Popover/NotesPopover.swift b/Clocker/Panel/Notes Popover/NotesPopover.swift index fbb08d4..d7e628a 100644 --- a/Clocker/Panel/Notes Popover/NotesPopover.swift +++ b/Clocker/Panel/Notes Popover/NotesPopover.swift @@ -76,9 +76,9 @@ class NotesPopover: NSViewController { alertPopupButton.setAccessibilityIdentifier("RemindersAlertPopup") reminderView.setAccessibilityIdentifier("RemindersView") - if #available(macOS 10.16, *) { - alertPopupButton.controlSize = .large - } +// if #available(macOS 10.16, *) { +// alertPopupButton.controlSize = .large +// } } override func viewWillAppear() { diff --git a/Clocker/Panel/ParentPanelController.swift b/Clocker/Panel/ParentPanelController.swift index f98c342..486291d 100644 --- a/Clocker/Panel/ParentPanelController.swift +++ b/Clocker/Panel/ParentPanelController.swift @@ -167,11 +167,11 @@ class ParentPanelController: NSWindowController { showDebugVersionViewIfNeccesary() - #if DEBUG - if #available(macOS 10.16, *) { - mainTableView.style = .fullWidth - } - #endif +// #if DEBUG +// if #available(macOS 10.16, *) { +// mainTableView.style = .fullWidth +// } +// #endif } private func showDebugVersionViewIfNeccesary() {