From c0ea7cf4a4ec91105651242b48cc8596828fc072 Mon Sep 17 00:00:00 2001 From: tisfeng Date: Tue, 6 Feb 2024 23:27:07 +0800 Subject: [PATCH 1/4] perf: adjust settings page size --- Easydict/NewApp/View/SettingView/SettingView.swift | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Easydict/NewApp/View/SettingView/SettingView.swift b/Easydict/NewApp/View/SettingView/SettingView.swift index 665c01377..2d73db6f0 100644 --- a/Easydict/NewApp/View/SettingView/SettingView.swift +++ b/Easydict/NewApp/View/SettingView/SettingView.swift @@ -66,24 +66,22 @@ struct SettingView: View { func resizeWindowFrame() { guard let window else { return } - // Disable zoom button, ref: https://stackoverflow.com/a/66039864/8378840 + // Disable zoom button, refer: https://stackoverflow.com/a/66039864/8378840 window.standardWindowButton(.zoomButton)?.isEnabled = false // Keep the settings page windows all the same width to avoid strange animations. - let maxWidth = 750 + let maxWidth = 780 let height = switch selection { - case .general: - maxWidth - 100 - case .service: - 600 - case .disabled, .shortcut: + case .disabled: 500 + case .advanced: + 400 case .privacy: 320 case .about: 450 default: - 400 + maxWidth - 110 } let newSize = CGSize(width: maxWidth, height: height) From 4ecd6915d47c2bad52ffb68efb0db1ab5c6e3dd3 Mon Sep 17 00:00:00 2001 From: tisfeng Date: Tue, 6 Feb 2024 23:36:13 +0800 Subject: [PATCH 2/4] perf: adjust shortcut view size --- .../View/SettingView/Tabs/View/Shortcut/KeyHolderRowView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderRowView.swift b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderRowView.swift index 98e0789a9..42cbc41d2 100644 --- a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderRowView.swift +++ b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderRowView.swift @@ -18,7 +18,7 @@ struct KeyHolderRowView: View { HStack { Text(LocalizedStringKey(title)) Spacer() - KeyHolderWrapper(shortcutType: type, confictAlterMessage: $confictAlterMessage).frame(width: 180, height: 24) + KeyHolderWrapper(shortcutType: type, confictAlterMessage: $confictAlterMessage).frame(width: 180, height: 26) } } } From 9a7b3a7c2c9d1dfa55c302dfc5487654dc23a95a Mon Sep 17 00:00:00 2001 From: Sharker <1548742234@qq.com> Date: Tue, 6 Feb 2024 23:50:06 +0800 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Tisfeng --- .../SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift index 3ac1dd92a..6d7b2e2c4 100644 --- a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift +++ b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift @@ -25,7 +25,7 @@ extension ShortcutTab { KeyHolderDataItem(title: "shortcut_increase_font", type: .increaseFontSize), KeyHolderDataItem(title: "shortcut_decrease_font", type: .decreaseFontSize), KeyHolderDataItem(title: "open_in_google", type: .google), - KeyHolderDataItem(title: "open_in_eudic", type: .increaseFontSize), + KeyHolderDataItem(title: "open_in_eudic", type: .eudic), KeyHolderDataItem(title: "open_in_apple_dictionary", type: .increaseFontSize), ] @State var confictAlterMessage: ShortcutConfictAlertMessage = .init(title: "", message: "") From afd12af1675cfb0021cfdc418c2a5c83cf2e536c Mon Sep 17 00:00:00 2001 From: Tisfeng Date: Tue, 6 Feb 2024 23:52:32 +0800 Subject: [PATCH 4/4] Update Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift --- .../SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift index 6d7b2e2c4..6d0cfa868 100644 --- a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift +++ b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/AppShortcutSetting.swift @@ -26,7 +26,7 @@ extension ShortcutTab { KeyHolderDataItem(title: "shortcut_decrease_font", type: .decreaseFontSize), KeyHolderDataItem(title: "open_in_google", type: .google), KeyHolderDataItem(title: "open_in_eudic", type: .eudic), - KeyHolderDataItem(title: "open_in_apple_dictionary", type: .increaseFontSize), + KeyHolderDataItem(title: "open_in_apple_dictionary", type: .appleDic), ] @State var confictAlterMessage: ShortcutConfictAlertMessage = .init(title: "", message: "") var body: some View {