Rework top bar to not include toolbar
Closes #7679 by creating a definite top bar, and moving the toolbar below it. Still side-steps the E2E test issue by allowing the modeling scene extend under this top bar. I will finally address this in the next step, which is bringing back a proper sidebar that doesn't overlay the modeling scene. I have a fast-follow PR coming that adds visual undo and redo buttons to this top bar, but I wanted to keep them separate.
This commit is contained in:
26
src/App.tsx
26
src/App.tsx
@ -71,8 +71,8 @@ import { Toolbar } from '@src/Toolbar'
|
|||||||
sceneInfra.camControls.engineStreamActor = engineStreamActor
|
sceneInfra.camControls.engineStreamActor = engineStreamActor
|
||||||
|
|
||||||
maybeWriteToDisk()
|
maybeWriteToDisk()
|
||||||
.then(() => { })
|
.then(() => {})
|
||||||
.catch(() => { })
|
.catch(() => {})
|
||||||
|
|
||||||
export function App() {
|
export function App() {
|
||||||
const { state: modelingState } = useModelingContext()
|
const { state: modelingState } = useModelingContext()
|
||||||
@ -277,18 +277,18 @@ export function App() {
|
|||||||
localItems={[
|
localItems={[
|
||||||
...(getSettings().app.showDebugPanel.current
|
...(getSettings().app.showDebugPanel.current
|
||||||
? ([
|
? ([
|
||||||
{
|
{
|
||||||
id: 'modeling-state',
|
id: 'modeling-state',
|
||||||
element: 'text',
|
element: 'text',
|
||||||
label:
|
label:
|
||||||
modelingState.value instanceof Object
|
modelingState.value instanceof Object
|
||||||
? (xStateValueToString(modelingState.value) ?? '')
|
? (xStateValueToString(modelingState.value) ?? '')
|
||||||
: modelingState.value,
|
: modelingState.value,
|
||||||
toolTip: {
|
toolTip: {
|
||||||
children: 'The current state of the modeler',
|
children: 'The current state of the modeler',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
] satisfies StatusBarItemType[])
|
||||||
] satisfies StatusBarItemType[])
|
|
||||||
: []),
|
: []),
|
||||||
{
|
{
|
||||||
id: 'selection',
|
id: 'selection',
|
||||||
|
|||||||
Reference in New Issue
Block a user