development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #186402 (#186542)

Browse source
This commit is contained in:
Henning Dieterichs 2023-06-28 20:51:33 +02:00 committed by GitHub
parent 941450fd05
commit 09f6e50352
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/browser/widget/diffEditorWidget2/delegatingEditorImpl.ts
View file

@ -23,7 +23,7 @@ export abstract class DelegatingEditor extends Disposable implements IEditor {
protected abstract get _targetEditor(): CodeEditorWidget;
getId(): string { return this.getEditorType() + ':' + this._id; }
getId(): string { return this.getEditorType() + ':v2:' + this._id; }
abstract getEditorType(): string;
abstract updateOptions(newOptions: IEditorOptions): void;

13
src/vs/editor/browser/widget/diffEditorWidget2/diffReview.ts
View file

@ -216,7 +216,7 @@ export class DiffReview2 extends Disposable {
this._diffEditor.setPosition(new Position(entries[0].modifiedLineStart, 1));
this._diffEditor.setSelection({ startColumn: 1, startLineNumber: entries[0].modifiedLineStart, endColumn: Constants.MAX_SAFE_SMALL_INTEGER, endLineNumber: entries[entries.length - 1].modifiedLineEnd });
this._isVisible = true;
//this._diffEditor.doLayout();
this.layout();
this._render();
this._goToRow(this._getPrevRow(), 'previous');
}
@ -251,7 +251,7 @@ export class DiffReview2 extends Disposable {
this._diffEditor.setPosition(new Position(entries[0].modifiedLineStart, 1));
this._diffEditor.setSelection({ startColumn: 1, startLineNumber: entries[0].modifiedLineStart, endColumn: Constants.MAX_SAFE_SMALL_INTEGER, endLineNumber: entries[entries.length - 1].modifiedLineEnd });
this._isVisible = true;
//this._diffEditor.doLayout();
this.layout();
this._render();
this._goToRow(this._getNextRow(), 'next');
}
@ -277,7 +277,7 @@ export class DiffReview2 extends Disposable {
this._isVisible = false;
this._diffEditor.updateOptions({ readOnly: false });
this._diffEditor.focus();
//this._diffEditor.doLayout();
this.layout();
this._render();
}
@ -336,9 +336,14 @@ export class DiffReview2 extends Disposable {
}
private _width: number = 0;
private _top: number = 0;
private _height: number = 0;
public layout(top: number, width: number, height: number): void {
public layout(top: number = this._top, width: number = this._width, height: number = this._height): void {
this._width = width;
this._top = top;
this._height = height;
this.shadow.setTop(top - 6);
this.shadow.setWidth(width);
this.shadow.setHeight(this._isVisible ? 6 : 0);

2
src/vs/editor/browser/widget/media/diffReview.css
View file

@ -13,6 +13,7 @@
position: absolute;
user-select: none;
-webkit-user-select: none;
z-index: 99;
}
.monaco-diff-editor .diff-review-summary {
@ -53,6 +54,7 @@
position: absolute;
right: 10px;
top: 2px;
z-index: 100;
}
.monaco-diff-editor .diff-review-actions .action-label {