fix: Layout rotation fixes.

zmkfirmware · Aug 8, 2024 · 4e53eaf · 4e53eaf
1 parent 6ea574d
commit 4e53eaf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/keyboard/Keymap.tsx b/src/keyboard/Keymap.tsx
@@ -63,7 +63,7 @@ export const Keymap = ({
       y: k.y / 100.0,
       width: k.width / 100,
       height: k.height / 100.0,
-      r: k.r / 100.0,
+      r: (k.r || 0) / 100.0,
       rx: (k.rx || 0) / 100.0,
       ry: (k.ry || 0) / 100.0,
       children: <span>{label}</span>,

diff --git a/src/keyboard/PhysicalLayout.tsx b/src/keyboard/PhysicalLayout.tsx
@@ -7,6 +7,9 @@ export type KeyPosition = PropsWithChildren<{
   height: number;
   x: number;
   y: number;
+  r?: number;
+  rx?: number;
+  ry?: number;
 }>;
 
 interface PhysicalLayoutProps {

diff --git a/src/keyboard/PhysicalLayoutPicker.tsx b/src/keyboard/PhysicalLayoutPicker.tsx
@@ -66,12 +66,17 @@ export const PhysicalLayoutPicker = ({
                 <PhysicalLayout
                   oneU={15}
                   hoverZoom={false}
-                  positions={l.keys.map(({ x, y, width, height }) => ({
-                    x: x / 100.0,
-                    y: y / 100.0,
-                    width: width / 100.0,
-                    height: height / 100.0,
-                  }))}
+                  positions={l.keys.map(
+                    ({ x, y, width, height, r, rx, ry }) => ({
+                      x: x / 100.0,
+                      y: y / 100.0,
+                      width: width / 100.0,
+                      height: height / 100.0,
+                      r: (r || 0) / 100.0,
+                      rx: (rx || 0) / 100.0,
+                      ry: (ry || 0) / 100.0,
+                    })
+                  )}
                 />
               </div>
             </ListBoxItem>