Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c3f12631
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
c3f12631
编写于
7月 14, 2021
作者:
D
Daniel Imms
提交者:
GitHub
7月 14, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #128700 from microsoft/tyriar/r158_128342
Fallback to 80x30 dimensions in terminal
上级
268e9dae
5e159d1b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
5 deletion
+19
-5
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
...vs/workbench/contrib/terminal/browser/terminalInstance.ts
+19
-5
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
浏览文件 @
c3f12631
...
...
@@ -79,7 +79,10 @@ const enum Constants {
* terminal process. This period helps ensure the terminal has good initial dimensions to work
* with if it's going to be a foreground terminal.
*/
WaitForContainerThreshold
=
100
WaitForContainerThreshold
=
100
,
DefaultCols
=
80
,
DefaultRows
=
30
,
}
let
xtermConstructor
:
Promise
<
typeof
XTermTerminal
>
|
undefined
;
...
...
@@ -538,9 +541,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
const
editorOptions
=
this
.
_configurationService
.
getValue
<
IEditorOptions
>
(
'
editor
'
);
const
xterm
=
new
Terminal
({
// TODO: Replace null with undefined when https://github.com/xtermjs/xterm.js/issues/3329 is resolved
cols
:
this
.
_cols
||
null
as
any
,
rows
:
this
.
_rows
||
null
as
any
,
cols
:
this
.
_cols
||
Constants
.
DefaultCols
,
rows
:
this
.
_rows
||
Constants
.
DefaultRows
,
altClickMovesCursor
:
config
.
altClickMovesCursor
&&
editorOptions
.
multiCursorModifier
===
'
alt
'
,
scrollback
:
config
.
scrollback
,
theme
:
this
.
_getXtermTheme
(),
...
...
@@ -1058,6 +1060,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this
.
_wrapperElement
.
classList
.
toggle
(
'
active
'
,
visible
);
}
if
(
visible
&&
this
.
_xterm
&&
this
.
_xtermCore
)
{
// Resize to re-evaluate dimensions, this will ensure when switching to a terminal it is
// using the most up to date dimensions (eg. when terminal is created in the background
// using cached dimensions of a split terminal).
this
.
_resize
();
// Trigger a manual scroll event which will sync the viewport and scroll bar. This is
// necessary if the number of rows in the terminal has decreased while it was in the
// background since scrollTop changes take no effect but the terminal's position does
...
...
@@ -1159,8 +1166,15 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
if
(
this
.
_isDisposed
)
{
return
;
}
// Re-evaluate dimensions if the container has been set since the xterm instance was created
if
(
this
.
_container
&&
this
.
_cols
===
0
&&
this
.
_rows
===
0
)
{
this
.
_initDimensions
();
this
.
_xterm
?.
resize
(
this
.
_cols
||
Constants
.
DefaultCols
,
this
.
_rows
||
Constants
.
DefaultRows
);
}
const
hadIcon
=
!!
this
.
shellLaunchConfig
.
icon
;
await
this
.
_processManager
.
createProcess
(
this
.
_shellLaunchConfig
,
this
.
_cols
,
this
.
_r
ows
,
this
.
_accessibilityService
.
isScreenReaderOptimized
()).
then
(
error
=>
{
await
this
.
_processManager
.
createProcess
(
this
.
_shellLaunchConfig
,
this
.
_cols
||
Constants
.
DefaultCols
,
this
.
_rows
||
Constants
.
DefaultR
ows
,
this
.
_accessibilityService
.
isScreenReaderOptimized
()).
then
(
error
=>
{
if
(
error
)
{
this
.
_onProcessExit
(
error
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录