Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b2949445
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,发现更多精彩内容 >>
提交
b2949445
编写于
6月 28, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #29326: Avoid flickering by respecting the previous frame layout decision
上级
ddafd222
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
28 addition
and
5 deletion
+28
-5
src/vs/editor/browser/viewParts/minimap/minimap.ts
src/vs/editor/browser/viewParts/minimap/minimap.ts
+28
-5
未找到文件。
src/vs/editor/browser/viewParts/minimap/minimap.ts
浏览文件 @
b2949445
...
@@ -155,6 +155,11 @@ class MinimapLayout {
...
@@ -155,6 +155,11 @@ class MinimapLayout {
*/
*/
public
readonly
scrollTop
:
number
;
public
readonly
scrollTop
:
number
;
/**
* The given editor scrollHeight (input).
*/
public
readonly
scrollHeight
:
number
;
private
readonly
_computedSliderRatio
:
number
;
private
readonly
_computedSliderRatio
:
number
;
/**
/**
...
@@ -177,6 +182,7 @@ class MinimapLayout {
...
@@ -177,6 +182,7 @@ class MinimapLayout {
constructor
(
constructor
(
scrollTop
:
number
,
scrollTop
:
number
,
scrollHeight
:
number
,
computedSliderRatio
:
number
,
computedSliderRatio
:
number
,
sliderTop
:
number
,
sliderTop
:
number
,
sliderHeight
:
number
,
sliderHeight
:
number
,
...
@@ -184,6 +190,7 @@ class MinimapLayout {
...
@@ -184,6 +190,7 @@ class MinimapLayout {
endLineNumber
:
number
endLineNumber
:
number
)
{
)
{
this
.
scrollTop
=
scrollTop
;
this
.
scrollTop
=
scrollTop
;
this
.
scrollHeight
=
scrollHeight
;
this
.
_computedSliderRatio
=
computedSliderRatio
;
this
.
_computedSliderRatio
=
computedSliderRatio
;
this
.
sliderTop
=
sliderTop
;
this
.
sliderTop
=
sliderTop
;
this
.
sliderHeight
=
sliderHeight
;
this
.
sliderHeight
=
sliderHeight
;
...
@@ -207,7 +214,8 @@ class MinimapLayout {
...
@@ -207,7 +214,8 @@ class MinimapLayout {
viewportContainsWhitespaceGaps
:
boolean
,
viewportContainsWhitespaceGaps
:
boolean
,
lineCount
:
number
,
lineCount
:
number
,
scrollTop
:
number
,
scrollTop
:
number
,
scrollHeight
:
number
scrollHeight
:
number
,
previousLayout
:
MinimapLayout
):
MinimapLayout
{
):
MinimapLayout
{
const
pixelRatio
=
options
.
pixelRatio
;
const
pixelRatio
=
options
.
pixelRatio
;
const
minimapLineHeight
=
getMinimapLineHeight
(
options
.
renderMinimap
);
const
minimapLineHeight
=
getMinimapLineHeight
(
options
.
renderMinimap
);
...
@@ -256,12 +264,26 @@ class MinimapLayout {
...
@@ -256,12 +264,26 @@ class MinimapLayout {
const
startLineNumber
=
1
;
const
startLineNumber
=
1
;
const
endLineNumber
=
lineCount
;
const
endLineNumber
=
lineCount
;
return
new
MinimapLayout
(
scrollTop
,
computedSliderRatio
,
sliderTop
,
sliderHeight
,
startLineNumber
,
endLineNumber
);
return
new
MinimapLayout
(
scrollTop
,
scrollHeight
,
computedSliderRatio
,
sliderTop
,
sliderHeight
,
startLineNumber
,
endLineNumber
);
}
else
{
}
else
{
const
startLineNumber
=
Math
.
max
(
1
,
Math
.
floor
(
viewportStartLineNumber
-
sliderTop
*
pixelRatio
/
minimapLineHeight
));
let
startLineNumber
=
Math
.
max
(
1
,
Math
.
floor
(
viewportStartLineNumber
-
sliderTop
*
pixelRatio
/
minimapLineHeight
));
// Avoid flickering caused by a partial viewport start line
// by being consistent w.r.t. the previous layout decision
if
(
previousLayout
&&
previousLayout
.
scrollHeight
===
scrollHeight
)
{
if
(
previousLayout
.
scrollTop
>
scrollTop
)
{
// Scrolling up => never increase `startLineNumber`
startLineNumber
=
Math
.
min
(
startLineNumber
,
previousLayout
.
startLineNumber
);
}
if
(
previousLayout
.
scrollTop
<
scrollTop
)
{
// Scrolling down => never decrease `startLineNumber`
startLineNumber
=
Math
.
max
(
startLineNumber
,
previousLayout
.
startLineNumber
);
}
}
const
endLineNumber
=
Math
.
min
(
lineCount
,
startLineNumber
+
minimapLinesFitting
-
1
);
const
endLineNumber
=
Math
.
min
(
lineCount
,
startLineNumber
+
minimapLinesFitting
-
1
);
return
new
MinimapLayout
(
scrollTop
,
computedSliderRatio
,
sliderTop
,
sliderHeight
,
startLineNumber
,
endLineNumber
);
return
new
MinimapLayout
(
scrollTop
,
scrollHeight
,
computedSliderRatio
,
sliderTop
,
sliderHeight
,
startLineNumber
,
endLineNumber
);
}
}
}
}
}
}
...
@@ -651,7 +673,8 @@ export class Minimap extends ViewPart {
...
@@ -651,7 +673,8 @@ export class Minimap extends ViewPart {
(
renderingCtx
.
viewportData
.
whitespaceViewportData
.
length
>
0
),
(
renderingCtx
.
viewportData
.
whitespaceViewportData
.
length
>
0
),
this
.
_context
.
model
.
getLineCount
(),
this
.
_context
.
model
.
getLineCount
(),
renderingCtx
.
scrollTop
,
renderingCtx
.
scrollTop
,
renderingCtx
.
scrollHeight
renderingCtx
.
scrollHeight
,
this
.
_lastRenderData
?
this
.
_lastRenderData
.
renderedLayout
:
null
);
);
this
.
_slider
.
setTop
(
layout
.
sliderTop
);
this
.
_slider
.
setTop
(
layout
.
sliderTop
);
this
.
_slider
.
setHeight
(
layout
.
sliderHeight
);
this
.
_slider
.
setHeight
(
layout
.
sliderHeight
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录