diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 9dfb6a38..d9aa780d 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -425,15 +425,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op 'resources/win32/vue.ico', 'resources/win32/xml.ico', 'resources/win32/yaml.ico', - 'resources/win32/code_70x70.png', - 'resources/win32/code_150x150.png' + 'resources/win32/code_70x70.png', // <-- Void icon + 'resources/win32/code_150x150.png' // <-- Void icon ], { base: '.' })); } else if (platform === 'linux') { - all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); + all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); // <-- Void icon } else if (platform === 'darwin') { const shortcut = gulp.src('resources/darwin/bin/code.sh') .pipe(replace('@@APPNAME@@', product.applicationName)) - .pipe(rename('bin/code')); + .pipe(rename('bin/code')); // <-- Void icon all = es.merge(all, shortcut); } diff --git a/build/lib/electron.ts b/build/lib/electron.ts index 7a2a2a19..47985a95 100644 --- a/build/lib/electron.ts +++ b/build/lib/electron.ts @@ -68,7 +68,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string, nameOrSuff role: 'Editor', ostypes: ['TEXT', 'utxt', 'TUTX', '****'], extensions, - iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns', + iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns', // <-- Void icon code.icns utis }; } @@ -196,7 +196,7 @@ export const config = { darwinForceDarkModeSupport: true, darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined, linuxExecutableName: product.applicationName, - winIcon: 'resources/win32/code.ico', + winIcon: 'resources/win32/code.ico', // <-- Void icon token: process.env['GITHUB_TOKEN'], repo: product.electronRepository || undefined, validateChecksum: true, diff --git a/resources/darwin/code.icns b/resources/darwin/code.icns index a91b7c58..6b7c7274 100644 Binary files a/resources/darwin/code.icns and b/resources/darwin/code.icns differ diff --git a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts index 07f42272..ee91243c 100644 --- a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts +++ b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts @@ -774,7 +774,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService { // console.log('TOP ONLY') const numOverlappingLines = endLine - diffArea.startLine + 1 const numRemainingLinesInDA = diffArea.endLine - diffArea.startLine + 1 - numOverlappingLines - const newHeight = numRemainingLinesInDA + (newTextHeight - 1) + const newHeight = (numRemainingLinesInDA - 1) + (newTextHeight - 1) + 1 diffArea.startLine = startLine diffArea.endLine = startLine + newHeight } diff --git a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx index 86977840..6f4ff7c0 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx @@ -76,11 +76,11 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang inputBoxRef.current.value = instructions }, [initText, instructions]) - return
+ return
{ - if (e.currentTarget === e.target) { - inputBoxRef.current?.focus() - } + inputBoxRef.current?.focus() }} > -
-
+
{ inlineDiffsService.removeCtrlKZone({ diffareaid }) }} + onClick={() => { inlineDiffsService.removeCtrlKZone({ diffareaid }) }} />
@@ -147,7 +151,7 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang @@[&_select]:!void-border-none @@[&_select]:!void-outline-none' > - +
{/* submit / stop button */} 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 32bdac87..8d65745e 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 @@ -526,9 +526,7 @@ export const SidebarChat = () => { onSubmit(e) }} onClick={(e) => { - if (e.currentTarget === e.target) { - inputBoxRef.current?.focus() - } + inputBoxRef.current?.focus() }} > {/* top row */}