From 525079407e4a065c7bfaceb22b6cc23f02db66dd Mon Sep 17 00:00:00 2001 From: Stef Kors Date: Mon, 28 Mar 2022 11:40:48 +0200 Subject: [PATCH 1/3] Improve sizing behaviour code file view and inspector sidebar splitiview --- CodeEdit/WorkspaceView.swift | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift index 92c27bb989..ec58868609 100644 --- a/CodeEdit/WorkspaceView.swift +++ b/CodeEdit/WorkspaceView.swift @@ -53,18 +53,19 @@ struct WorkspaceView: View { LeadingSidebar(workspace: workspace, windowController: windowController) .frame(minWidth: 250) HSplitView { - ZStack { - WorkspaceCodeFileView(windowController: windowController, - workspace: workspace) - } - .safeAreaInset(edge: .bottom) { - if let url = workspace.fileURL { - StatusBarView(workspaceURL: url) - } - } - InspectorSidebar(workspace: workspace, windowController: windowController) - .frame(minWidth: 250, maxWidth: 250, maxHeight: .infinity) - } + ZStack { + WorkspaceCodeFileView(windowController: windowController, workspace: workspace) + .frame(minWidth: 150, maxHeight: .infinity) + } + .safeAreaInset(edge: .bottom) { + if let url = workspace.fileURL { + StatusBarView(workspaceURL: url) + } + } + .layoutPriority(1) + InspectorSidebar(workspace: workspace, windowController: windowController) + .frame(minWidth: 150, idealWidth: 200, maxHeight: .infinity) + } } } From 6f37bf2dcc4488cd56ae643ae1e4c8882cefea0c Mon Sep 17 00:00:00 2001 From: Stef Kors Date: Mon, 28 Mar 2022 12:41:03 +0200 Subject: [PATCH 2/3] Bump minWidth of InspectorSidebar to 260 --- CodeEdit/WorkspaceView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift index ec58868609..ff4b2a587d 100644 --- a/CodeEdit/WorkspaceView.swift +++ b/CodeEdit/WorkspaceView.swift @@ -64,7 +64,7 @@ struct WorkspaceView: View { } .layoutPriority(1) InspectorSidebar(workspace: workspace, windowController: windowController) - .frame(minWidth: 150, idealWidth: 200, maxHeight: .infinity) + .frame(minWidth: 260, idealWidth: 300, maxHeight: .infinity) } } } From 6f55146798fa1bb27c9a8b50e827b6ebbcd8cacb Mon Sep 17 00:00:00 2001 From: Stef Kors Date: Mon, 28 Mar 2022 13:31:48 +0200 Subject: [PATCH 3/3] Set WorkspaceCodeFileView minWidth to 500 --- CodeEdit/WorkspaceView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift index ff4b2a587d..252a1343f6 100644 --- a/CodeEdit/WorkspaceView.swift +++ b/CodeEdit/WorkspaceView.swift @@ -55,7 +55,7 @@ struct WorkspaceView: View { HSplitView { ZStack { WorkspaceCodeFileView(windowController: windowController, workspace: workspace) - .frame(minWidth: 150, maxHeight: .infinity) + .frame(minWidth: 500, maxHeight: .infinity) } .safeAreaInset(edge: .bottom) { if let url = workspace.fileURL {