提交 047618c3 编写于 作者: D Daniel Imms

Source terminal dimensions from only the outer container

The inner container may not be created/attached yet.

Fixes #31235
上级 dac7e15a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
.monaco-workbench .panel.integrated-terminal .terminal-outer-container { .monaco-workbench .panel.integrated-terminal .terminal-outer-container {
height: 100%; height: 100%;
padding-left: 20px; /*Don't use right padding in case xterm.js misbehaves*/ padding-left: 20px; /*Don't use right padding in case xterm.js misbehaves*/
padding-bottom: 2px;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -27,9 +28,8 @@ ...@@ -27,9 +28,8 @@
.monaco-workbench .panel.integrated-terminal .terminal-wrapper.active { .monaco-workbench .panel.integrated-terminal .terminal-wrapper.active {
display: block; display: block;
position: absolute; position: absolute;
bottom: 0; bottom: 2px; /* Matches padding-bottom on .terminal-outer-container */
top: 0; top: 0;
padding-bottom: 2px;
} }
.monaco-workbench .panel.integrated-terminal .xterm a:not(.xterm-invalid-link) { .monaco-workbench .panel.integrated-terminal .xterm a:not(.xterm-invalid-link) {
......
...@@ -205,8 +205,10 @@ export class TerminalInstance implements ITerminalInstance { ...@@ -205,8 +205,10 @@ export class TerminalInstance implements ITerminalInstance {
} }
} }
const padding = parseInt(getComputedStyle(document.querySelector('.terminal-outer-container')).paddingLeft.split('px')[0], 10); const outerContainer = document.querySelector('.terminal-outer-container');
const paddingBottom = parseInt(getComputedStyle(document.querySelector('.terminal-wrapper.active')).paddingBottom.split('px')[0], 10); const outerContainerStyle = getComputedStyle(outerContainer);
const padding = parseInt(outerContainerStyle.paddingLeft.split('px')[0], 10);
const paddingBottom = parseInt(outerContainerStyle.paddingBottom.split('px')[0], 10);
// Use left padding as right padding, right padding is not defined in CSS just in case // Use left padding as right padding, right padding is not defined in CSS just in case
// xterm.js causes an unexpected overflow. // xterm.js causes an unexpected overflow.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册