Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7a8e3bac
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,发现更多精彩内容 >>
提交
7a8e3bac
编写于
3月 31, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
listen to editor pane layout change instead of dom for width change.
上级
8b38d4c3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
23 deletion
+24
-23
src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
...bench/contrib/notebook/browser/view/renderers/codeCell.ts
+18
-17
src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
...h/contrib/notebook/browser/viewModel/codeCellViewModel.ts
+6
-6
未找到文件。
src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
浏览文件 @
7a8e3bac
...
...
@@ -93,25 +93,26 @@ export class CodeCell extends Disposable {
templateData
.
editor
?.
getModel
()?.
setMode
(
mode
.
languageIdentifier
);
}));
let
cellWidthResizeObserver
=
getResizesObserver
(
templateData
.
editorContainer
!
,
{
width
:
width
,
height
:
totalHeight
},
()
=>
{
let
newWidth
=
cellWidthResizeObserver
.
getWidth
();
let
realContentHeight
=
templateData
.
editor
!
.
getContentHeight
();
templateData
.
editor
?.
layout
(
{
width
:
newWidth
,
height
:
realContentHeight
}
);
this
.
_register
(
viewCell
.
onDidChangeLayout
((
e
)
=>
{
if
(
e
.
outerWidth
===
undefined
)
{
return
;
}
viewCell
.
editorHeight
=
realContentHeight
;
this
.
relayoutCell
();
});
const
layoutInfo
=
templateData
.
editor
!
.
getLayoutInfo
();
const
realContentHeight
=
templateData
.
editor
!
.
getContentHeight
();
cellWidthResizeObserver
.
startObserving
();
this
.
_register
(
cellWidthResizeObserver
);
if
(
layoutInfo
.
width
!==
viewCell
.
layoutInfo
.
editorWidth
)
{
templateData
.
editor
?.
layout
(
{
width
:
viewCell
.
layoutInfo
.
editorWidth
,
height
:
realContentHeight
}
);
viewCell
.
editorHeight
=
realContentHeight
;
this
.
relayoutCell
();
}
}));
this
.
_register
(
templateData
.
editor
!
.
onDidContentSizeChange
((
e
)
=>
{
if
(
e
.
contentHeightChanged
)
{
...
...
src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
浏览文件 @
7a8e3bac
...
...
@@ -36,7 +36,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
private
readonly
_onDidChangeContent
:
Emitter
<
void
>
=
this
.
_register
(
new
Emitter
<
void
>
());
public
readonly
onDidChangeContent
:
Event
<
void
>
=
this
.
_onDidChangeContent
.
event
;
protected
readonly
_onDidChangeLayout
=
new
Emitter
<
void
>
();
protected
readonly
_onDidChangeLayout
=
new
Emitter
<
CodeCellLayoutChangeEvent
>
();
readonly
onDidChangeLayout
=
this
.
_onDidChangeLayout
.
event
;
private
_editorHeight
=
0
;
...
...
@@ -83,7 +83,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
this
.
_layoutInfo
=
{
fontInfo
:
initialNotebookLayoutInfo
?.
fontInfo
||
null
,
editorHeight
:
0
,
editorWidth
:
0
,
editorWidth
:
initialNotebookLayoutInfo
!==
undefined
?
initialNotebookLayoutInfo
!
.
width
-
CELL_MARGIN
*
2
-
CELL_RUN_GUTTER
:
0
,
outputContainerOffset
:
0
,
outputTotalHeight
:
0
,
totalHeight
:
0
,
...
...
@@ -112,7 +112,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
const
indicatorHeight
=
this
.
editorHeight
+
outputTotalHeight
;
const
outputContainerOffset
=
EDITOR_TOOLBAR_HEIGHT
+
EDITOR_TOP_MARGIN
+
this
.
editorHeight
;
const
bottomToolbarOffset
=
totalHeight
-
BOTTOM_CELL_TOOLBAR_HEIGHT
;
const
editorWidth
=
state
.
outerWidth
!==
undefined
?
state
.
outerWidth
-
CELL_MARGIN
*
2
-
CELL_RUN_GUTTER
:
0
;
const
editorWidth
=
state
.
outerWidth
!==
undefined
?
state
.
outerWidth
-
CELL_MARGIN
*
2
-
CELL_RUN_GUTTER
:
this
.
_layoutInfo
?.
editorWidth
;
this
.
_layoutInfo
=
{
fontInfo
:
state
.
font
||
null
,
editorHeight
:
this
.
_editorHeight
,
...
...
@@ -128,11 +128,11 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
state
.
totalHeight
=
true
;
}
this
.
_fireOnDidChangeLayout
();
this
.
_fireOnDidChangeLayout
(
state
);
}
private
_fireOnDidChangeLayout
()
{
this
.
_onDidChangeLayout
.
fire
();
private
_fireOnDidChangeLayout
(
state
:
CodeCellLayoutChangeEvent
)
{
this
.
_onDidChangeLayout
.
fire
(
state
);
}
hasDynamicHeight
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录