Improve window layouts, event handling and UserLexicon

TypeDuck-HK · Sep 30, 2024 · 6e6c0a0 · 6e6c0a0
1 parent 203ad18
commit 6e6c0a0
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 121 deletions.
diff --git a/TypeDuck/AppContext.swift b/TypeDuck/AppContext.swift
@@ -45,12 +45,11 @@ final class AppContext: ObservableObject {
                 highlightedIndex = newHighlightedIndex
         }
 
-        func updateInputForm(to form: InputForm? = nil) {
-                let newForm: InputForm = form ?? InputForm.matchInputMethodMode()
-                if newForm.isOptions {
+        func updateInputForm(to form: InputForm) {
+                if form.isOptions {
                         optionsHighlightedIndex = minIndex
                 }
-                inputForm = newForm
+                inputForm = form
         }
         func updateWindowPattern(to pattern: WindowPattern) {
                 windowPattern = pattern

diff --git a/TypeDuck/AppDelegate.swift b/TypeDuck/AppDelegate.swift
@@ -4,7 +4,6 @@ import CoreIME
 
 @MainActor
 @main
-@objc(AppDelegate)
 final class AppDelegate: NSObject, NSApplicationDelegate {
 
         static let shared: AppDelegate = AppDelegate()

diff --git a/TypeDuck/Localizable.xcstrings b/TypeDuck/Localizable.xcstrings
@@ -3142,7 +3142,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Directly Toggle Specific Option"
+            "value" : "Directly Toggle a Specific Option"
           }
         },
         "yue" : {

diff --git a/TypeDuck/MotherBoard.swift b/TypeDuck/MotherBoard.swift
@@ -5,7 +5,8 @@ struct MotherBoard: View {
         @EnvironmentObject private var context: AppContext
 
         var body: some View {
-                ZStack(alignment: context.windowPattern.windowAlignment) {
+                let windowPattern = context.windowPattern
+                ZStack(alignment: windowPattern.windowAlignment) {
                         Color.clear
                         if context.inputForm.isOptions {
                                 OptionsView()
@@ -15,5 +16,6 @@ struct MotherBoard: View {
                                 CandidateBoard()
                         }
                 }
+                .fixedSize(horizontal: !(windowPattern.isReversingHorizontal), vertical: !(windowPattern.isReversingVertical))
         }
 }
diff --git a/TypeDuck/PrincipalApplication.swift b/TypeDuck/PrincipalApplication.swift
@@ -1,7 +1,6 @@
 import AppKit
 
 @MainActor
-@objc(PrincipalApplication)
 final class PrincipalApplication: NSApplication {
 
         override init() {

diff --git a/TypeDuck/TypeDuckInputController.swift b/TypeDuck/TypeDuckInputController.swift
diff --git a/TypeDuck/UserLexicon.swift b/TypeDuck/UserLexicon.swift
@@ -2,19 +2,26 @@ import Foundation
 import SQLite3
 import CoreIME
 
+@MainActor
 struct UserLexicon: Sendable {
 
-        nonisolated(unsafe) private static var database: OpaquePointer? = nil
+        private static let database: OpaquePointer? = {
+                var db: OpaquePointer? = nil
+                let path: String? = {
+                        let fileName: String = "userlexicon.sqlite3"
+                        if #available(macOS 13.0, *) {
+                                return URL.libraryDirectory.appending(path: fileName, directoryHint: .notDirectory).path()
+                        } else {
+                                guard let libraryDirectoryUrl: URL = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first else { return nil }
+                                return libraryDirectoryUrl.appendingPathComponent(fileName, isDirectory: false).path
+                        }
+                }()
+                guard let path else { return nil }
+                guard sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nil) == SQLITE_OK else { return nil }
+                return db
+        }()
 
         static func prepare() {
-                guard database == nil else { return }
-                guard let libraryDirectoryUrl: URL = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first else { return }
-                let userLexiconUrl: URL = libraryDirectoryUrl.appendingPathComponent("userlexicon.sqlite3", isDirectory: false)
-                if sqlite3_open_v2(userLexiconUrl.path, &database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nil) == SQLITE_OK {
-                        ensureTable()
-                }
-        }
-        private static func ensureTable() {
                 let command: String = "CREATE TABLE IF NOT EXISTS userlexicontable(id INTEGER NOT NULL PRIMARY KEY, frequency INTEGER NOT NULL, word TEXT NOT NULL, romanization TEXT NOT NULL, shortcut INTEGER NOT NULL, ping INTEGER NOT NULL);"
                 var statement: OpaquePointer? = nil
                 defer { sqlite3_finalize(statement) }