Merge pull request #7 from po-miyasaka/feature/1.0.7

1.0.7
po-miyasaka · Jul 21, 2022 · 5916c43 · 5916c43
2 parents 1256e34 + ff170fb
commit 5916c43
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 66 deletions.
diff --git a/CopyHistory/CopyHistory.xcodeproj/project.pbxproj b/CopyHistory/CopyHistory.xcodeproj/project.pbxproj
@@ -271,7 +271,7 @@
 				CODE_SIGN_ENTITLEMENTS = CopyHistory/CopyHistory.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = H6UU7923NK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -285,7 +285,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "jp.po-miyasaka.CopyHistory.CopyHistory";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -301,7 +301,7 @@
 				CODE_SIGN_ENTITLEMENTS = CopyHistory/CopyHistory.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = H6UU7923NK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -315,7 +315,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "jp.po-miyasaka.CopyHistory.CopyHistory";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/CopyHistory/CopyHistory/AppDelegate.swift b/CopyHistory/CopyHistory/AppDelegate.swift
@@ -27,8 +27,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         statusBar = .init(
             ContentView(),
             width: 500,
-            height: 700,
-            image: NSImage(imageLiteralResourceName: "logo.svg")
+            height: NSScreen.main?.frame.height ?? 800.0,
+            image: NSImage(imageLiteralResourceName: "logo")
         )
     }
 
@@ -42,7 +42,7 @@ private final class StatusBarController<Content: View>: NSObject, NSPopoverDeleg
     var popover: NSPopover?
     var statusBarItem: NSStatusItem?
 
-    init(_: Content, width: Int, height: Int, image: NSImage) {
+    init(_: Content, width: CGFloat, height: CGFloat, image: NSImage) {
         super.init()
         let popover = NSPopover()
         popover.contentSize = NSSize(width: width, height: height)