Merge pull request #465 from ensan-hcl/feature/back_button_for_clipbo…

…ard_history_tab [Feature] コピー履歴タブに戻るボタンを追加
ensan-hcl · May 3, 2024 · 95cb0fe · 95cb0fe
2 parents ea00358 + a9c7f3d
commit 95cb0fe
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/AzooKeyCore/Sources/KeyboardViews/View/SpecialTabs/ClipboardHistoryTab.swift b/AzooKeyCore/Sources/KeyboardViews/View/SpecialTabs/ClipboardHistoryTab.swift
@@ -201,6 +201,9 @@ struct ClipboardHistoryTab<Extension: ApplicationSpecificKeyboardViewExtension>:
     private func deleteKey(_ design: TabDependentDesign) -> some View {
         SimpleKeyView<Extension>(model: SimpleKeyModel<Extension>(keyLabelType: .image("delete.left"), unpressedKeyColorType: .special, pressActions: [.delete(1)], longPressActions: .init(repeat: [.delete(1)])), tabDesign: design)
     }
+    private func backTabKey(_ design: TabDependentDesign) -> some View {
+        SimpleKeyView<Extension>(model: SimpleKeyModel<Extension>(keyLabelType: .text("戻る"), unpressedKeyColorType: .special, pressActions: [.moveTab(.system(.last_tab))], longPressActions: .none), tabDesign: design)
+    }
 
     var body: some View {
         Group {
@@ -209,7 +212,8 @@ struct ClipboardHistoryTab<Extension: ApplicationSpecificKeyboardViewExtension>:
                 VStack {
                     listView
                     HStack {
-                        let design = TabDependentDesign(width: 2, height: 7, interfaceSize: variableStates.interfaceSize, orientation: .vertical)
+                        let design = TabDependentDesign(width: 3, height: 7, interfaceSize: variableStates.interfaceSize, orientation: .vertical)
+                        backTabKey(design)
                         enterKey(design)
                         deleteKey(design)
                     }
@@ -218,7 +222,8 @@ struct ClipboardHistoryTab<Extension: ApplicationSpecificKeyboardViewExtension>:
                 HStack {
                     listView
                     VStack {
-                        let design = TabDependentDesign(width: 8, height: 2, interfaceSize: variableStates.interfaceSize, orientation: .horizontal)
+                        let design = TabDependentDesign(width: 8, height: 3, interfaceSize: variableStates.interfaceSize, orientation: .horizontal)
+                        backTabKey(design)
                         deleteKey(design)
                         enterKey(design)
                     }