setup - tweak default window dimensions to better account for secondary sidebar

Author: bpasero

src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts

@@ -98,7 +98,7 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 		const windowState: IWindowState = {};
 		const overrides: IDefaultBrowserWindowOptionsOverrides = {};
 
-		const features = details.features.split(','); // for example: popup=yes,left=270,top=14.5,width=800,height=600
+		const features = details.features.split(','); // for example: popup=yes,left=270,top=14.5,width=1024,height=768
 		for (const feature of features) {
 			const [key, value] = feature.split('=');
 			switch (key) {

src/vs/platform/window/electron-main/window.ts

@@ -139,8 +139,8 @@ export interface IWindowState {
 
 export const defaultWindowState = function (mode = WindowMode.Normal): IWindowState {
 	return {
-		width: 1024,
-		height: 768,
+		width: 1200,
+		height: 800,
 		mode
 	};
 };
@@ -154,8 +154,8 @@ export const defaultAuxWindowState = function (): IWindowState {
 	// we need to set not only width and height but also x and y to
 	// a good location on the primary display.
 
-	const width = 800;
-	const height = 600;
+	const width = 1024;
+	const height = 768;
 	const workArea = electron.screen.getPrimaryDisplay().workArea;
 	const x = Math.max(workArea.x + (workArea.width / 2) - (width / 2), 0);
 	const y = Math.max(workArea.y + (workArea.height / 2) - (height / 2), 0);

src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts

@@ -183,8 +183,8 @@ suite('Windows State Storing', () => {
 					"mode": 1,
 					"x": 768,
 					"y": 336,
-					"width": 1024,
-					"height": 768
+					"width": 1200,
+					"height": 800
 				}
 			}
 		}`;
@@ -194,7 +194,7 @@ suite('Windows State Storing', () => {
 			openedWindows: [],
 			lastActiveWindow: {
 				backupPath: '/home/user/.config/code-oss-dev/Backups/1549539668998',
-				uiState: { mode: WindowMode.Normal, x: 768, y: 336, width: 1024, height: 768 }
+				uiState: { mode: WindowMode.Normal, x: 768, y: 336, width: 1200, height: 800 }
 			}
 		};
 		assertEqualWindowsState(expected, windowsState, 'v1_32_empty_window');

src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts

@@ -77,7 +77,7 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 
 		// Open and configure chat view
 		await this.commandService.executeCommand(CHAT_OPEN_ACTION_ID);
-		ensureSideBarChatViewSize(400, this.viewDescriptorService, this.layoutService);
+		ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService);
 
 		// Only do this once
 		this.storageService.store(ChatGettingStartedContribution.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);

src/vs/workbench/contrib/chat/browser/chat.ts

@@ -52,16 +52,16 @@ export async function showEditsView(viewsService: IViewsService): Promise<IChatW
 	return (await viewsService.openView<ChatViewPane>(EditsViewId))?.widget;
 }
 
-export function ensureSideBarChatViewSize(width: number, viewDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService): void {
+export function ensureSideBarChatViewSize(viewDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService): void {
 	const location = viewDescriptorService.getViewLocationById(ChatViewId);
 	if (location === ViewContainerLocation.Panel) {
 		return; // panel is typically very wide
 	}
 
 	const viewPart = location === ViewContainerLocation.Sidebar ? Parts.SIDEBAR_PART : Parts.AUXILIARYBAR_PART;
 	const partSize = layoutService.getSize(viewPart);
-	if (partSize.width < width) {
-		layoutService.setSize(viewPart, { width: width, height: partSize.height });
+	if (partSize.width < 300) {
+		layoutService.setSize(viewPart, { width: 300, height: partSize.height });
 	}
 }
 

src/vs/workbench/contrib/chat/browser/chatSetup.ts

@@ -172,7 +172,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				await that.context.update({ hidden: false });
 
 				showCopilotView(viewsService, layoutService);
-				ensureSideBarChatViewSize(400, viewDescriptorService, layoutService);
+				ensureSideBarChatViewSize(viewDescriptorService, layoutService);
 
 				if (startSetup === true) {
 					that.controller.value.setup();
@@ -911,26 +911,29 @@ class ChatSetupWelcomeContent extends Disposable {
 			const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
 			this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element);
 
-			const features = this.element.appendChild($('div.chat-features-container'));
-			this.element.appendChild(features);
+			const featuresParent = this.element.appendChild($('div.chat-features-container'));
+			this.element.appendChild(featuresParent);
 
-			const featureChatContainer = features.appendChild($('div.chat-feature-container'));
+			const featuresContainer = this.element.appendChild($('div'));
+			featuresParent.appendChild(featuresContainer);
+
+			const featureChatContainer = featuresContainer.appendChild($('div.chat-feature-container'));
 			featureChatContainer.appendChild(renderIcon(Codicon.code));
 
 			const featureChatLabel = featureChatContainer.appendChild($('span'));
-			featureChatLabel.textContent = localize('featureChat', "Code faster with completions and Inline Chat");
+			featureChatLabel.textContent = localize('featureChat', "Code faster with Completions");
 
-			const featureEditsContainer = features.appendChild($('div.chat-feature-container'));
+			const featureEditsContainer = featuresContainer.appendChild($('div.chat-feature-container'));
 			featureEditsContainer.appendChild(renderIcon(Codicon.editSession));
 
 			const featureEditsLabel = featureEditsContainer.appendChild($('span'));
-			featureEditsLabel.textContent = localize('featureEdits', "Build features and resolve bugs with Copilot Edits");
+			featureEditsLabel.textContent = localize('featureEdits', "Build features with Copilot Edits");
 
-			const featureExploreContainer = features.appendChild($('div.chat-feature-container'));
+			const featureExploreContainer = featuresContainer.appendChild($('div.chat-feature-container'));
 			featureExploreContainer.appendChild(renderIcon(Codicon.commentDiscussion));
 
 			const featureExploreLabel = featureExploreContainer.appendChild($('span'));
-			featureExploreLabel.textContent = localize('featureExplore', "Explore your codebase with chat");
+			featureExploreLabel.textContent = localize('featureExplore', "Explore your codebase with Chat");
 		}
 
 		// Limited SKU

src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css

@@ -11,6 +11,8 @@
 	}
 
 	.chat-features-container {
+		display: flex;
+		justify-content: center;
 		text-align: initial;
 		border-radius: 2px;
 		border: 1px solid var(--vscode-chat-requestBorder);

src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts

@@ -225,7 +225,7 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
 
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly DEFAULT_SIZE = { width: 800, height: 600 };
+	private static readonly DEFAULT_SIZE = { width: 1024, height: 768 };
 
 	private static WINDOW_IDS = getWindowId(mainWindow) + 1; // start from the main window ID + 1