Merge pull request #71 from 3colorr/v1.1.1

V1.1.1
3colorr · Oct 1, 2023 · f58e215 · f58e215
2 parents f7641ee + 2cfaef2
commit f58e215
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/Mizuame/ContentView.swift b/Mizuame/ContentView.swift
@@ -84,6 +84,7 @@ struct ContentView: View {
                         if isShowSavingMessage && !isExecutableSave {
                             Text("sitickynote.menu.message.saving")
                                 .padding(.horizontal, 5)
+                                .layoutPriority(1)
                         }
 
                         Spacer()
@@ -126,14 +127,29 @@ struct ContentView: View {
                                 printer.doPrinting(content: stickyText)
                             }
 
-                        Image(systemName: "gearshape.fill")
-                            .foregroundColor(Color(bodyForegroundTheme))
-                            .onTapGesture {
+                        if #available(macOS 14, *) {
+                            SettingsLink {
+                                Image(systemName: "gearshape.fill")
+                                    .foregroundColor(Color(bodyForegroundTheme))
+                            }
+                            .buttonStyle(SettingsLinkStyle())
+                            .onHover { _ in
                                 isShowMessagebar = false
                                 userAction = .NONE
-
-                                delegate.showSettings()
                             }
+                            // Not work.
+                            // .onTapGesture {}
+
+                        } else {
+                            Image(systemName: "gearshape.fill")
+                                .foregroundColor(Color(bodyForegroundTheme))
+                                .onTapGesture {
+                                    isShowMessagebar = false
+                                    userAction = .NONE
+
+                                    delegate.showSettings()
+                                }
+                        }
                     }
                     .padding(EdgeInsets(top: 5, leading: 10, bottom: 5, trailing: 10))
 

diff --git a/Mizuame/MizuameApp.swift b/Mizuame/MizuameApp.swift
@@ -69,17 +69,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 
             let menu = NSMenu()
 
-            // If the user don't agree terms of service and privacy policy,
-            // Mizuame don't show preferences.
-            if viewState == SettingsViewState.PREFERENCE.rawValue {
-                menu.addItem(
-                    withTitle: NSLocalizedString("menubar.clickevent.right.menu.item.preference", comment: ""),
-                    action: #selector(showSettings),
-                    keyEquivalent: ""
-                )
-                menu.addItem(.separator())
-            }
-
             menu.addItem(
                 withTitle: NSLocalizedString("menubar.clickevent.right.menu.item.quit", comment: ""),
                 action: #selector(quitApp),

diff --git a/Mizuame/Settings/TabInfo.swift b/Mizuame/Settings/TabInfo.swift
@@ -30,7 +30,7 @@ struct TabInfo: View {
                 }
 
                 VStack(alignment: .leading, spacing: 5) {
-                    Text("Version: 1.1.0").font(.body)
+                    Text("Version: 1.1.1").font(.body)
                     Text("License: MIT license").font(.body)
                     HStack {
                         Text("settings.tab.info.src").font(.body)

diff --git a/Mizuame/SettingsViewStyle.swift b/Mizuame/SettingsViewStyle.swift
@@ -0,0 +1,16 @@
+//
+//  SettingsViewStyle.swift
+//  Mizuame
+//
+//  Created by becomefoolish on 2023/09/30.
+//
+
+import SwiftUI
+
+struct SettingsLinkStyle: ButtonStyle {
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .background(.clear)
+    }
+}