Skip to content

Fix editor sticky scroll shadow missing #309253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −5
Open

Fix editor sticky scroll shadow missing #309253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,26 @@
*--------------------------------------------------------------------------------------------*/

.monaco-editor .sticky-widget {
overflow: hidden;
border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
width: 100%;
box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;
z-index: 4;
right: initial !important;
margin-left: '0px';
}

.monaco-editor .sticky-widget .sticky-widget-content {
overflow: hidden;
border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
}

.monaco-editor .sticky-widget .sticky-widget-shadow {
position: absolute;
bottom: -3px;
left: 0;
height: 3px;
width: 100%;
box-shadow: var(--vscode-editorStickyScroll-shadow) 0 6px 6px -6px inset;
}

.monaco-editor .sticky-widget .sticky-widget-line-numbers {
float: left;
background-color: var(--vscode-editorStickyScrollGutter-background);
Expand Down
13 changes: 11 additions & 2 deletions src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {

private readonly _foldingIconStore = this._register(new DisposableStore());
private readonly _rootDomNode: HTMLElement = document.createElement('div');
private readonly _contentDomNode: HTMLElement = document.createElement('div');
private readonly _lineNumbersDomNode: HTMLElement = document.createElement('div');
private readonly _linesDomNodeScrollable: HTMLElement = document.createElement('div');
private readonly _linesDomNode: HTMLElement = document.createElement('div');
private readonly _shadowDomNode: HTMLElement = document.createElement('div');

private readonly _editor: ICodeEditor;

Expand Down Expand Up @@ -87,10 +89,16 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
this._linesDomNodeScrollable.className = 'sticky-widget-lines-scrollable';
this._linesDomNodeScrollable.appendChild(this._linesDomNode);

this._contentDomNode.className = 'sticky-widget-content';
this._contentDomNode.appendChild(this._lineNumbersDomNode);
this._contentDomNode.appendChild(this._linesDomNodeScrollable);

this._shadowDomNode.className = 'sticky-widget-shadow';

this._rootDomNode.className = 'sticky-widget';
this._rootDomNode.classList.toggle('peek', editor instanceof EmbeddedCodeEditorWidget);
this._rootDomNode.appendChild(this._lineNumbersDomNode);
this._rootDomNode.appendChild(this._linesDomNodeScrollable);
this._rootDomNode.appendChild(this._contentDomNode);
this._rootDomNode.appendChild(this._shadowDomNode);
this._setHeight(0);

const updateScrollLeftPosition = () => {
Expand Down Expand Up @@ -266,6 +274,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
this._rootDomNode.style.display = 'block';
this._lineNumbersDomNode.style.height = `${this._height}px`;
this._linesDomNodeScrollable.style.height = `${this._height}px`;
this._contentDomNode.style.height = `${this._height}px`;
this._rootDomNode.style.height = `${this._height}px`;
}

Expand Down