Merge pull request #452 from ensan-hcl/fix/touch_detection

[fix] キーボードバーの判定が広すぎる問題を修正
ensan-hcl · Apr 16, 2024 · bfd5220 · bfd5220
2 parents 95cf32f + 8e1288c
commit bfd5220
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/AzooKeyCore/Sources/KeyboardViews/View/KeyboardView.swift b/AzooKeyCore/Sources/KeyboardViews/View/KeyboardView.swift
@@ -52,12 +52,12 @@ public struct KeyboardView<Extension: ApplicationSpecificKeyboardViewExtension>:
                 if isResultViewExpanded {
                     ExpandedResultView<Extension>(isResultViewExpanded: $isResultViewExpanded)
                 } else {
-                    VStack(spacing: 0) {
-                        KeyboardBarView<Extension>(isResultViewExpanded: $isResultViewExpanded)
-                            .frame(height: Design.keyboardBarHeight(interfaceHeight: variableStates.interfaceSize.height, orientation: variableStates.keyboardOrientation))
-                            .padding(.vertical, 6)
-                        keyboardView(tab: defaultTab ?? variableStates.tabManager.existentialTab())
-                    }
+                    KeyboardBarView<Extension>(isResultViewExpanded: $isResultViewExpanded)
+                        .frame(height: Design.keyboardBarHeight(interfaceHeight: variableStates.interfaceSize.height, orientation: variableStates.keyboardOrientation))
+                        // バーのタッチ判定領域はpaddingより前まで
+                        .contentShape(Rectangle())
+                        .padding(.vertical, 6)
+                    keyboardView(tab: defaultTab ?? variableStates.tabManager.existentialTab())
                 }
             }
             .resizingFrame(