From cbf767290ee58303124690a243e0a384e1d4234d Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Thu, 2 Apr 2026 22:33:28 +0200
Subject: [PATCH] Enhance App.tsx with new handlers for viewport layout, panel
 activation, and panel-specific view/display modes

---
 src/app/App.tsx | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index 1dc214b4..179eb52f 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1288,6 +1288,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
   const requestViewportFocus = (selection: EditorSelection, status?: string) => {
     setFocusRequest((current) => ({
       id: current.id + 1,
+      panelId: activePanelId,
       selection
     }));
 
@@ -1296,14 +1297,44 @@ export function App({ store, initialStatusMessage }: AppProps) {
     }
   };
 
-  const handleSetViewportViewMode = (nextViewMode: ViewportViewMode) => {
-    if (editorState.viewportViewMode === nextViewMode) {
+  const handleSetViewportLayoutMode = (nextLayoutMode: ViewportLayoutMode) => {
+    if (editorState.viewportLayoutMode === nextLayoutMode) {
       return;
     }
 
     blurActiveTextEntry();
-    store.setViewportViewMode(nextViewMode);
-    setStatusMessage(`Switched the viewport to ${getViewportViewModeLabel(nextViewMode)} view.`);
+    store.setViewportLayoutMode(nextLayoutMode);
+    setStatusMessage(`Switched the viewport to ${getViewportLayoutModeLabel(nextLayoutMode)}.`);
+  };
+
+  const handleActivateViewportPanel = (panelId: ViewportPanelId) => {
+    if (editorState.activeViewportPanelId === panelId) {
+      return;
+    }
+
+    blurActiveTextEntry();
+    store.setActiveViewportPanel(panelId);
+    setStatusMessage(`Activated the ${getViewportPanelLabel(panelId)} viewport panel.`);
+  };
+
+  const handleSetViewportPanelViewMode = (panelId: ViewportPanelId, nextViewMode: ViewportViewMode) => {
+    if (editorState.viewportPanels[panelId].viewMode === nextViewMode) {
+      return;
+    }
+
+    blurActiveTextEntry();
+    store.setViewportPanelViewMode(panelId, nextViewMode);
+    setStatusMessage(`Set the ${getViewportPanelLabel(panelId)} panel to ${getViewportViewModeLabel(nextViewMode)} view.`);
+  };
+
+  const handleSetViewportPanelDisplayMode = (panelId: ViewportPanelId, nextDisplayMode: ViewportDisplayMode) => {
+    if (editorState.viewportPanels[panelId].displayMode === nextDisplayMode) {
+      return;
+    }
+
+    blurActiveTextEntry();
+    store.setViewportPanelDisplayMode(panelId, nextDisplayMode);
+    setStatusMessage(`Set the ${getViewportPanelLabel(panelId)} panel to ${getViewportDisplayModeLabel(nextDisplayMode)} display.`);
   };
 
   const handleCreateBoxBrush = (center?: Vec3) => {