From e888f261fed6b2ea5bd5adddb72516d77be3fdcd Mon Sep 17 00:00:00 2001 From: Mathew Pareles Date: Sun, 12 Jan 2025 03:58:42 -0800 Subject: [PATCH] accept/reject on right --- .../contrib/void/browser/inlineDiffsService.ts | 13 +++++++++++-- .../react/src/quick-edit-tsx/QuickEditChat.tsx | 3 +-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts index dabf64af..f32d37cd 100644 --- a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts +++ b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts @@ -1522,10 +1522,19 @@ class AcceptRejectWidget extends Widget implements IOverlayWidget { this._domNode.style.top = `${topPx}px` } const updateLeft = () => { - const leftPx = 0//editor.getScrollLeft() - editor.getScrollWidth() - this._domNode.style.left = `${leftPx}px` + const layoutInfo = editor.getLayoutInfo(); + const minimapWidth = layoutInfo.minimap.minimapWidth; + const verticalScrollbarWidth = layoutInfo.verticalScrollbarWidth; + const buttonWidth = this._domNode.offsetWidth; + + const leftPx = layoutInfo.width - minimapWidth - verticalScrollbarWidth - buttonWidth; + this._domNode.style.left = `${leftPx}px`; } + // Mount first, then update positions + editor.addOverlayWidget(this); + + updateTop() updateLeft() diff --git a/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx index da6b05ff..40ba88f2 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx @@ -95,8 +95,7 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC rounded-md bg-vscode-input-bg border border-void-border-3 focus-within:border-void-border-1 hover:border-void-border-1 - ` - } + `} onKeyDown={(e) => { if (e.key === 'Enter' && !e.shiftKey) { onSubmit(e)