Merge pull request IvanMathy#286 from IvanMathy/feat/bigsur

Feat/bigsur
jrodin · Aug 8, 2021 · d11dadd · d11dadd
2 parents 64ad011 + 26199f4
commit d11dadd
Show file tree

Hide file tree

Showing 18 changed files with 246 additions and 168 deletions.
diff --git a/Boop/Boop.xcodeproj/project.pbxproj b/Boop/Boop.xcodeproj/project.pbxproj
@@ -61,6 +61,8 @@
 		2C60A55724871273006496BA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C20667921FD62910082570E /* MainMenu.xib */; };
 		2C60A55824871273006496BA /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C5ED41D2357F67200322893 /* Preferences.storyboard */; };
 		2C60A56224871730006496BA /* UpdateTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C60A4E524870678006496BA /* UpdateTextField.swift */; };
+		2C873BE12697C2A800D9A3F0 /* PopoverContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C873BE02697C2A800D9A3F0 /* PopoverContainerView.swift */; };
+		2C873BE42697C34200D9A3F0 /* PopoverContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C873BE02697C2A800D9A3F0 /* PopoverContainerView.swift */; };
 		2C8BE181249EBADC00099B73 /* SavannaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE180249EBADC00099B73 /* SavannaKit */; };
 		2C8BE182249EBADC00099B73 /* SavannaKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE180249EBADC00099B73 /* SavannaKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		2C8BE184249EBAEC00099B73 /* SavannaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE183249EBAEC00099B73 /* SavannaKit */; };
@@ -144,6 +146,7 @@
 		2C60A4A3248300CE006496BA /* AppVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersion.swift; sourceTree = "<group>"; };
 		2C60A4E524870678006496BA /* UpdateTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateTextField.swift; sourceTree = "<group>"; };
 		2C60A56024871273006496BA /* Boop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Boop.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		2C873BE02697C2A800D9A3F0 /* PopoverContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverContainerView.swift; sourceTree = "<group>"; };
 		2C9118B523406B530018916F /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		2C9761D42214E11600AFF8CD /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = "<group>"; };
 		2C9761D82214E3B500AFF8CD /* ScriptsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptsTableViewController.swift; sourceTree = "<group>"; };
@@ -284,6 +287,7 @@
 				2C9761E02214E68D00AFF8CD /* ScriptTableViewCell.swift */,
 				2CA245DB224822EA00586DFD /* ScriptTableView.swift */,
 				2C60A4E524870678006496BA /* UpdateTextField.swift */,
+				2C873BE02697C2A800D9A3F0 /* PopoverContainerView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -496,6 +500,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2C873BE12697C2A800D9A3F0 /* PopoverContainerView.swift in Sources */,
 				2CC211C5236FB5C1007CECEE /* ScriptsSettingsViewController.swift in Sources */,
 				2C53B6E0226D404E00DC6861 /* ScriptExecution.swift in Sources */,
 				2C0BC0DD24AAC518009B8631 /* Script+Require.swift in Sources */,
@@ -539,6 +544,7 @@
 				2C60A54224871273006496BA /* DefaultTheme.swift in Sources */,
 				2C60A54324871273006496BA /* ScriptManager.swift in Sources */,
 				2C60A54424871273006496BA /* AppDelegate.swift in Sources */,
+				2C873BE42697C34200D9A3F0 /* PopoverContainerView.swift in Sources */,
 				2C60A54524871273006496BA /* OverlayView.swift in Sources */,
 				2C60A54624871273006496BA /* ScriptTableViewCell.swift in Sources */,
 				2C60A54724871273006496BA /* ScriptTableView.swift in Sources */,
@@ -745,7 +751,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = RLZ8XBTX7G;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -758,7 +764,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -775,7 +781,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -789,7 +795,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -806,7 +812,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -819,7 +825,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-D APPSTORE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
@@ -837,7 +843,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -850,7 +856,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-D APPSTORE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;

diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected] b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected] b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected] b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected] b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
diff --git a/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected] b/Boop/Boop/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Boop/Boop/Controllers/PopoverViewController.swift b/Boop/Boop/Controllers/PopoverViewController.swift
@@ -12,7 +12,7 @@ import SavannaKit
 class PopoverViewController: NSViewController {
 
     @IBOutlet weak var overlayView: OverlayView!
-    @IBOutlet weak var popoverView: PopoverView!
+    @IBOutlet weak var popoverView: PopoverContainerView!
     @IBOutlet weak var searchField: SearchField!
     @IBOutlet weak var editorView: SyntaxTextView!
     @IBOutlet weak var statusView: StatusView!

diff --git a/Boop/Boop/Editor/Themes/Colors.swift b/Boop/Boop/Editor/Themes/Colors.swift
@@ -45,12 +45,16 @@ struct ColorPair {
     static let orangish = ColorPair(light: Colors.orangeABitDarker, dark: Colors.orangeish)
 
     static let body = ColorPair(light: .init(white: 0.1, alpha: 1), dark: .white)
-    static let normal = ColorPair(light: .white, dark: .init(white: 0.1, alpha: 1))
-    static let gutter = ColorPair(light: .init(white: 240/255, alpha: 1), dark: .init(white: 22/255, alpha: 1))
-    static let popover = ColorPair(light: .white, dark: .init(white: 0.05, alpha: 1))
+    static let normal = ColorPair(light: .init(white: 0.85, alpha: 1), dark: .init(white: 0.3, alpha: 1))
+    static let gutter = ColorPair(light: .init(white: 240/255, alpha: 1), dark: .init(white: 27/255, alpha: 1))
+    static let popover = ColorPair(light: .init(white: 0.95, alpha: 1), dark: .init(white: 0.12, alpha: 1))
+
     static let comments = ColorPair(light: Colors.commentGreyDarkest, dark: Colors.commentGreyDarkest)
-    static let separator = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 15/255, alpha: 1))
-    static let background = ColorPair(light: .init(white: 0.95, alpha: 1), dark: NSColor(red: 31/255.0, green: 31/255, blue: 31/255, alpha: 1.0))
+    static let separator = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 45/255, alpha: 1))
+    static let background = ColorPair(light: .init(white: 0.95, alpha: 1), dark: .init(white: 31/255, alpha: 1))
+    static let overlayColor = ColorPair(light: NSColor(calibratedWhite: 0.85, alpha: 0.6), dark: NSColor(calibratedWhite: 0.08, alpha: 0.6))
+    static let popoverBorder = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 130/255, alpha: 1))
+    static let popoverOutline = ColorPair(light: .init(white: 150/255, alpha: 1), dark: .init(white: 20/255, alpha: 1))
 
 
     let light: NSColor

diff --git a/Boop/Boop/Views/OverlayView.swift b/Boop/Boop/Views/OverlayView.swift
@@ -15,15 +15,23 @@ class OverlayView: NSView {
     required init?(coder decoder: NSCoder) {
         super.init(coder: decoder)
         self.wantsLayer = true
-        self.layer?.backgroundColor = NSColor(calibratedWhite: 0.05, alpha: 1).cgColor
         self.animator().isHidden = true
         self.alphaValue = 0;
+
+        setBackground()
+    }
+
+    func setBackground() {
+
+        self.layer?.backgroundColor = ColorPair.overlayColor.value(for: self.effectiveAppearance).cgColor
+
+
     }
 
 
     func show() {
 
-        self.animator().alphaValue = 0.6
+        self.animator().alphaValue = 1
         self.animator().isHidden = false
     }
 
@@ -37,4 +45,9 @@ class OverlayView: NSView {
         onMouseDown?()
     }
 
+    override func viewDidChangeEffectiveAppearance() {
+        super.viewDidChangeEffectiveAppearance()
+        self.setBackground()
+    }
+
 }
diff --git a/Boop/Boop/Views/PopoverContainerView.swift b/Boop/Boop/Views/PopoverContainerView.swift
@@ -0,0 +1,60 @@
+//
+//  PopoverContainerView.swift
+//  Boop
+//
+//  Created by Ivan on 7/8/21.
+//  Copyright © 2021 OKatBest. All rights reserved.
+//
+
+import Foundation
+import AppKit
+
+
+class PopoverContainerView: NSView {
+
+    // This is a wrapper view so that the child popver actually clips
+    // the contained table. The issue was the shadow is technically
+    // part of the mask so rounded corners would get ignored.
+
+    required init?(coder decoder: NSCoder) {
+        super.init(coder: decoder)
+
+        self.wantsLayer = true
+        self.layer?.cornerRadius = 12.0
+
+        let dropShadow = NSShadow()
+        dropShadow.shadowColor = NSColor(calibratedWhite: 0, alpha: 0.45)
+        dropShadow.shadowOffset = NSMakeSize(0, -20.0)
+        dropShadow.shadowBlurRadius = 10.0
+
+
+        self.layer?.borderWidth = 0.5
+
+        self.shadow = dropShadow
+
+        self.isHidden = true
+
+        self.setOutline()
+
+    }
+
+    func setOutline() {
+        self.layer?.borderColor = ColorPair.popoverOutline.value(for: self.effectiveAppearance).cgColor
+    }
+
+    override func viewDidChangeEffectiveAppearance() {
+        super.viewDidChangeEffectiveAppearance()
+        self.setOutline()
+    }
+
+    func show() {
+        self.animator().alphaValue = 1
+        self.animator().isHidden = false
+    }
+
+    func hide() {
+        self.animator().alphaValue = 0
+        self.animator().isHidden = true;
+    }
+
+}
diff --git a/Boop/Boop/Views/PopoverView.swift b/Boop/Boop/Views/PopoverView.swift
@@ -15,35 +15,20 @@ class PopoverView: NSView {
 
         // UI set up
         self.wantsLayer = true
-        self.layer?.cornerRadius = 5.0
+        self.layer?.cornerRadius = 12.0
         self.layer?.masksToBounds = true
 
-        self.setBackground()
-
-        let dropShadow = NSShadow()
-        dropShadow.shadowColor = NSColor(calibratedWhite: 0, alpha: 1)
-        dropShadow.shadowOffset = NSMakeSize(0, -10.0)
-        dropShadow.shadowBlurRadius = 10.0
-
-        self.shadow = dropShadow
+        self.layer?.borderWidth = 1.5
 
-        self.isHidden = true
+        self.setBackground()
+
 
     }
 
-    func show() {
-        self.animator().alphaValue = 1
-        self.animator().isHidden = false
-    }
-
-    func hide() {
-        self.animator().alphaValue = 0
-        self.animator().isHidden = true;
-    }
-
     func setBackground() {
 
         self.layer?.backgroundColor = ColorPair.popover.value(for: self.effectiveAppearance).cgColor
+        self.layer?.borderColor = ColorPair.popoverBorder.value(for: self.effectiveAppearance).cgColor
 
     }
 

diff --git a/Boop/Boop/Views/StatusView.swift b/Boop/Boop/Views/StatusView.swift
@@ -36,7 +36,7 @@ class StatusView: NSView {
 
         self.wantsLayer = true
 
-        self.layer?.backgroundColor = NSColor.textBackgroundColor.cgColor
+        self.layer?.backgroundColor = ColorPair.normal.value(for: self.effectiveAppearance).cgColor
         self.layer?.cornerRadius = 5
 
     }