Merge pull request microsoft#158730 from microsoft/aiday/issue158571

Aiday Marlen Kyzy · web-flow · commit 4162134bd7ef · 2022-08-22T15:24:14.000+02:00
Placing sticky scroll above zone widget
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -49,6 +49,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 
 	}
 
+
 	public get lineNumbers(): number[] {
 		return this._lineNumbers;
 	}
@@ -93,6 +94,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		const renderLineInput: RenderLineInput =
 			new RenderLineInput(true, true, lineRenderingData.content,
 				lineRenderingData.continuesWithWrappedLine,
+
 				lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
 				lineRenderingData.tokens, actualInlineDecorations,
 				lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,
@@ -182,6 +184,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		} else if (minimapSide === 'right') {
 			this._rootDomNode.style.marginLeft = '0px';
 		}
+		this._rootDomNode.style.zIndex = '11';
 	}
 
 	public getId(): string {

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {`
`49`	`49`
`50`	`50`	`}`
`51`	`51`
	`52`	`+`
`52`	`53`	`public get lineNumbers(): number[] {`
`53`	`54`	`return this._lineNumbers;`
`54`	`55`	`}`
`@@ -93,6 +94,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {`
`93`	`94`	`const renderLineInput: RenderLineInput =`
`94`	`95`	`new RenderLineInput(true, true, lineRenderingData.content,`
`95`	`96`	`lineRenderingData.continuesWithWrappedLine,`
	`97`	`+`
`96`	`98`	`lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,`
`97`	`99`	`lineRenderingData.tokens, actualInlineDecorations,`
`98`	`100`	`lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,`
`@@ -182,6 +184,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {`
`182`	`184`	`} else if (minimapSide === 'right') {`
`183`	`185`	`this._rootDomNode.style.marginLeft = '0px';`
`184`	`186`	`}`
	`187`	`+ this._rootDomNode.style.zIndex = '11';`
`185`	`188`	`}`
`186`	`189`
`187`	`190`	`public getId(): string {`