Added ability to control height of black keys on .piano layout

AudioKit · Jun 26, 2023 · 5bb8cdf · 5bb8cdf
1 parent 238ac6c
commit 5bb8cdf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/Sources/Keyboard/Keyboard.swift b/Sources/Keyboard/Keyboard.swift
@@ -36,13 +36,14 @@ public struct Keyboard<Content>: View where Content: View {
     public var body: some View {
         ZStack {
             switch layout {
-            case let .piano(pitchRange, initialSpacerRatio, spacerRatio, relativeBlackKeyWidth):
+            case let .piano(pitchRange, initialSpacerRatio, spacerRatio, relativeBlackKeyWidth, relativeBlackKeyHeight):
                 Piano(content: content,
                       keyboard: model,
                       spacer: PianoSpacer(pitchRange: pitchRange,
                                           initialSpacerRatio: initialSpacerRatio,
                                           spacerRatio: spacerRatio,
-                                          relativeBlackKeyWidth: relativeBlackKeyWidth))
+                                          relativeBlackKeyWidth: relativeBlackKeyWidth,
+                                          relativeBlackKeyHeight: relativeBlackKeyHeight))
             case let .isomorphic(pitchRange, root, scale):
                 Isomorphic(content: content,
                            model: model,

diff --git a/Sources/Keyboard/Layouts/KeyboardLayout.swift b/Sources/Keyboard/Layouts/KeyboardLayout.swift
@@ -15,7 +15,8 @@ public enum KeyboardLayout: Equatable, Hashable {
     case piano(pitchRange: ClosedRange<Pitch>,
                initialSpacerRatio: [Letter: CGFloat] = PianoSpacer.defaultInitialSpacerRatio,
                spacerRatio: [Letter: CGFloat] = PianoSpacer.defaultSpacerRatio,
-               relativeBlackKeyWidth: CGFloat = PianoSpacer.defaultRelativeBlackKeyWidth)
+               relativeBlackKeyWidth: CGFloat = PianoSpacer.defaultRelativeBlackKeyWidth,
+               relativeBlackKeyHeight: CGFloat = PianoSpacer.defaultRelativeBlackKeyHeight)
 
     /// For piano roll, jam strip type views
     case verticalIsomorphic(pitchRange: ClosedRange<Pitch>,

diff --git a/Sources/Keyboard/Layouts/Piano.swift b/Sources/Keyboard/Layouts/Piano.swift
@@ -39,11 +39,7 @@ struct Piano<Content>: View where Content: View {
                             }
                         }
                     }
-
-                    // This space pushes the black keys up.
-                    // XXX: perhaps we should give the user control of
-                    //      the spacing.
-                    Spacer().frame(height: geo.size.height * 0.47)
+                    Spacer().frame(height: geo.size.height * (1 - spacer.relativeBlackKeyHeight))
                 }
             }
         }

diff --git a/Sources/Keyboard/Layouts/PianoSpacer.swift b/Sources/Keyboard/Layouts/PianoSpacer.swift
@@ -21,11 +21,16 @@ public struct PianoSpacer {
         .B: 10.0 / 16.0
     ]
     public static let defaultRelativeBlackKeyWidth: CGFloat = 9.0 / 16.0
+
+    /// Default value for Black Key Height
+    public static let defaultRelativeBlackKeyHeight: CGFloat = 0.53
 
     public var pitchRange: ClosedRange<Pitch>
     public var initialSpacerRatio: [Letter: CGFloat]
     public var spacerRatio: [Letter: CGFloat]
-    public var relativeBlackKeyWidth: CGFloat
+    public var relativeBlackKeyWidth: CGFloat = PianoSpacer.defaultRelativeBlackKeyWidth
+    /// The smaller the number, the shorter the black keys appear. A value of 1 approximates an isomorphic keyboard
+    public var relativeBlackKeyHeight: CGFloat = PianoSpacer.defaultRelativeBlackKeyHeight
 }
 
 extension PianoSpacer {