From 130a1c498b7ac13e5fe010c238f6811bb1605810 Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Sat, 3 Jan 2026 00:58:22 -0500
Subject: [PATCH] fix ghost/wire/solid toggle states

---
 src/kiri/app/keyboard.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/kiri/app/keyboard.js b/src/kiri/app/keyboard.js
index 22bb4be1..c68df9f6 100644
--- a/src/kiri/app/keyboard.js
+++ b/src/kiri/app/keyboard.js
@@ -262,6 +262,10 @@ class KeyboardControl {
             }
         }
 
+        let api = this.#api;
+        let isWireframe = api.local.getBoolean('model.wireframe');
+        let isGhost = api.local.getFloat('model.wireframe.opacity') < 1;
+
         switch (evt.keyCode) {
             case this.#cca('`'): this.#api.show.slices(0); break;
             case this.#cca('0'): {
@@ -398,10 +402,18 @@ class KeyboardControl {
                 }
                 break;
             case this.#cca('w'): // set ghost
-                $('render-ghost').onclick();
+                if (isGhost && !isWireframe) {
+                    $('render-solid').onclick();
+                } else {
+                    $('render-ghost').onclick();
+                }
                 break;
             case this.#cca('W'): // set wireframe
-                $('render-wire').onclick();
+                if (isWireframe) {
+                    $('render-solid').onclick();
+                } else {
+                    $('render-wire').onclick();
+                }
                 break;
             default:
                 this.#onUnhandledKey(evt);