From 5b55eed08af0f512da920dc8aaf69c88dcaaeb7e Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Tue, 17 Dec 2024 18:15:09 -0800
Subject: [PATCH] threads styles + misc

---
 .../browser/react/src/sidebar-tsx/Sidebar.tsx  |  2 +-
 .../react/src/sidebar-tsx/SidebarChat.tsx      |  2 +-
 .../src/sidebar-tsx/SidebarThreadSelector.tsx  |  2 +-
 .../react/src/void-settings-tsx/Settings.tsx   | 16 ++++++++--------
 .../contrib/void/browser/sidebarActions.ts     | 18 ++++++++++++++++++
 .../contrib/void/browser/voidSettingsPane.ts   |  6 +++---
 src/vs/workbench/workbench.common.main.ts      |  2 +-
 7 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
index f8f78d00..55fa83b7 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx
@@ -31,7 +31,7 @@ export const Sidebar = ({ className }: { className: string }) => {
 				sidebarStateService.setState({ currentTab: tabs[(index + 1) % tabs.length] as any })
 			}}>clickme {tab}</span> */}
 
-			<div className={`mb-2 w-full h-full ${isHistoryOpen ? '' : 'hidden'}`}>
+			<div className={`mb-2 w-full ${isHistoryOpen ? '' : 'hidden'}`}>
 				<ErrorBoundary>
 					<SidebarThreadSelector />
 				</ErrorBoundary>
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index 046dc5d9..e5ff34c9 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -407,7 +407,7 @@ export const SidebarChat = () => {
 		className={`w-full h-full`}
 	>
 		<ScrollToBottomContainer
-			className={`overflow-x-hidden overflow-y-auto space-y-4`}
+			className={`overflow-x-hidden overflow-y-auto`}
 			style={{ maxHeight: sidebarHeight - formHeight - 30 }}
 		>
 			{/* previous messages */}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx
index 39896d96..6a2b1943 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx
@@ -27,7 +27,7 @@ export const SidebarThreadSelector = () => {
 	const sortedThreadIds = Object.keys(allThreads ?? {}).sort((threadId1, threadId2) => allThreads![threadId1].lastModified > allThreads![threadId2].lastModified ? -1 : 1)
 
 	return (
-		<div className="flex flex-col gap-y-1 overflow-y-auto">
+		<div className="flex flex-col gap-y-1 max-h-[400px] overflow-y-auto">
 
 			{/* X button at top right */}
 			<div className="text-right">
diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
index c1df63bb..d9c34da9 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
@@ -217,7 +217,7 @@ export const VoidProviderSettings = () => {
 export const Settings = () => {
 	const isDark = useIsDark()
 
-	const [tab, setTab] = useState<'models' | 'providers'>('models')
+	const [tab, setTab] = useState<'models' | 'features'>('models')
 
 	return <div className={`@@void-scope ${isDark ? 'dark' : ''}`}>
 		<div className='w-full h-full px-10 py-10 select-none'>
@@ -236,9 +236,9 @@ export const Settings = () => {
 						<button className={`text-left p-1 my-0.5 rounded-sm overflow-hidden ${tab === 'models' ? 'bg-vscode-button-hover-bg' : 'bg-vscode-button-active-bg'} hover:bg-vscode-button-hover-bg active:bg-vscode-button-active-bg`}
 							onClick={() => { setTab('models') }}
 						>Models</button>
-						<button className={`text-left p-1 my-0.5 rounded-sm overflow-hidden ${tab === 'providers' ? 'bg-vscode-button-hover-bg' : 'bg-vscode-button-active-bg'} hover:bg-vscode-button-hover-bg active:bg-vscode-button-active-bg`}
-							onClick={() => { setTab('providers') }}
-						>Providers</button>
+						<button className={`text-left p-1 my-0.5 rounded-sm overflow-hidden ${tab === 'features' ? 'bg-vscode-button-hover-bg' : 'bg-vscode-button-active-bg'} hover:bg-vscode-button-hover-bg active:bg-vscode-button-active-bg`}
+							onClick={() => { setTab('features') }}
+						>Features</button>
 					</div>
 
 					{/* separator */}
@@ -255,15 +255,15 @@ export const Settings = () => {
 								<AddModelButton />
 								<RefreshableModels />
 							</ErrorBoundary>
-						</div>
-
-						<div className={`${tab !== 'providers' ? 'hidden' : ''}`}>
-							<h2 className={`text-3xl mb-2`} onClick={() => { setTab('providers') }}>Providers</h2>
 							<ErrorBoundary>
 								<VoidProviderSettings />
 							</ErrorBoundary>
 						</div>
 
+						<div className={`${tab !== 'features' ? 'hidden' : ''}`}>
+							<h2 className={`text-3xl mb-2`} onClick={() => { setTab('features') }}>Features</h2>
+						</div>
+
 					</div>
 				</div>
 
diff --git a/src/vs/workbench/contrib/void/browser/sidebarActions.ts b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
index 5f9a9356..e44fc864 100644
--- a/src/vs/workbench/contrib/void/browser/sidebarActions.ts
+++ b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
@@ -21,6 +21,8 @@ import { ITextModel } from '../../../../editor/common/model.js';
 import { VOID_VIEW_ID } from './sidebarPane.js';
 import { IMetricsService } from '../../../../platform/void/common/metricsService.js';
 import { ISidebarStateService } from './sidebarStateService.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { OPEN_VOID_SETTINGS_ACTION_ID } from './voidSettingsPane.js';
 
 
 // ---------- Register commands and keybindings ----------
@@ -161,3 +163,19 @@ registerAction2(class extends Action2 {
 	}
 })
 
+
+// Settings gear
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'void.settingsAction',
+			title: 'Void Settings',
+			icon: { id: 'settings-gear' },
+			menu: [{ id: MenuId.ViewTitle, group: 'navigation', when: ContextKeyExpr.equals('view', VOID_VIEW_ID), }]
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const commandService = accessor.get(ICommandService)
+		commandService.executeCommand(OPEN_VOID_SETTINGS_ACTION_ID)
+	}
+})
diff --git a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts b/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts
index 7974fd4c..3b7515b8 100644
--- a/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts
+++ b/src/vs/workbench/contrib/void/browser/voidSettingsPane.ts
@@ -120,12 +120,12 @@ Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane
 );
 
 
-const OPEN_VOID_SETTINGS_ID = 'workbench.action.openVoidSettings'
+export const OPEN_VOID_SETTINGS_ACTION_ID = 'workbench.action.openVoidSettings'
 // register the gear on the top right
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
-			id: OPEN_VOID_SETTINGS_ID,
+			id: OPEN_VOID_SETTINGS_ACTION_ID,
 			title: nls.localize2('voidSettings', "Void: Settings"),
 			f1: true,
 			icon: Codicon.settingsGear,
@@ -155,7 +155,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 	group: '0_command',
 	command: {
-		id: OPEN_VOID_SETTINGS_ID,
+		id: OPEN_VOID_SETTINGS_ACTION_ID,
 		title: nls.localize('voidSettings', "Void Settings")
 	},
 	order: 1
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index 36bd6ad4..14f3fec1 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -334,7 +334,7 @@ import './contrib/surveys/browser/nps.contribution.js';
 import './contrib/surveys/browser/languageSurveys.contribution.js';
 
 // Welcome
-import './contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js';
+// import './contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js'; // Void commented this out (removes Welcome page on start)
 import './contrib/welcomeWalkthrough/browser/walkThrough.contribution.js';
 import './contrib/welcomeViews/common/viewsWelcome.contribution.js';
 import './contrib/welcomeViews/common/newFile.contribution.js';