Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
2f1285a1
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,发现更多精彩内容 >>
提交
2f1285a1
编写于
3月 02, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #21740: Keybindings editor's info tooltips are misaligned
上级
0bc62d16
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts
...itor/contrib/defineKeybinding/browser/defineKeybinding.ts
+4
-4
src/vs/editor/contrib/folding/browser/folding.ts
src/vs/editor/contrib/folding/browser/folding.ts
+1
-0
src/vs/editor/contrib/folding/common/foldingModel.ts
src/vs/editor/contrib/folding/common/foldingModel.ts
+1
-1
未找到文件。
src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts
浏览文件 @
2f1285a1
...
@@ -179,21 +179,21 @@ export class DefineKeybindingController implements editorCommon.IEditorContribut
...
@@ -179,21 +179,21 @@ export class DefineKeybindingController implements editorCommon.IEditorContribut
data
.
forEach
((
item
)
=>
{
data
.
forEach
((
item
)
=>
{
let
msg
:
MarkedString
[];
let
msg
:
MarkedString
[];
let
className
:
string
;
let
className
:
string
;
let
inline
ClassName
:
string
;
let
beforeContent
ClassName
:
string
;
let
overviewRulerColor
:
string
;
let
overviewRulerColor
:
string
;
if
(
!
item
.
label
)
{
if
(
!
item
.
label
)
{
// this is the error case
// this is the error case
msg
=
[
NLS_KB_LAYOUT_ERROR_MESSAGE
];
msg
=
[
NLS_KB_LAYOUT_ERROR_MESSAGE
];
className
=
'
keybindingError
'
;
className
=
'
keybindingError
'
;
inline
ClassName
=
'
inlineKeybindingError
'
;
beforeContent
ClassName
=
'
inlineKeybindingError
'
;
overviewRulerColor
=
'
rgba(250, 100, 100, 0.6)
'
;
overviewRulerColor
=
'
rgba(250, 100, 100, 0.6)
'
;
}
else
{
}
else
{
// this is the info case
// this is the info case
msg
=
[
NLS_KB_LAYOUT_INFO_MESSAGE
];
msg
=
[
NLS_KB_LAYOUT_INFO_MESSAGE
];
msg
=
msg
.
concat
(
this
.
_keybindingService
.
getLabelFor
(
item
.
keybinding
));
msg
=
msg
.
concat
(
this
.
_keybindingService
.
getLabelFor
(
item
.
keybinding
));
className
=
'
keybindingInfo
'
;
className
=
'
keybindingInfo
'
;
inline
ClassName
=
'
inlineKeybindingInfo
'
;
beforeContent
ClassName
=
'
inlineKeybindingInfo
'
;
overviewRulerColor
=
'
rgba(100, 100, 250, 0.6)
'
;
overviewRulerColor
=
'
rgba(100, 100, 250, 0.6)
'
;
}
}
...
@@ -202,7 +202,7 @@ export class DefineKeybindingController implements editorCommon.IEditorContribut
...
@@ -202,7 +202,7 @@ export class DefineKeybindingController implements editorCommon.IEditorContribut
range
:
new
Range
(
item
.
range
.
startLineNumber
,
item
.
range
.
startColumn
,
item
.
range
.
startLineNumber
,
item
.
range
.
startColumn
+
1
),
range
:
new
Range
(
item
.
range
.
startLineNumber
,
item
.
range
.
startColumn
,
item
.
range
.
startLineNumber
,
item
.
range
.
startColumn
+
1
),
options
:
{
options
:
{
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
inlineClassName
:
inline
ClassName
beforeContentClassName
:
beforeContent
ClassName
}
}
});
});
...
...
src/vs/editor/contrib/folding/browser/folding.ts
浏览文件 @
2f1285a1
...
@@ -277,6 +277,7 @@ export class FoldingController implements IFoldingController {
...
@@ -277,6 +277,7 @@ export class FoldingController implements IFoldingController {
iconClicked
=
true
;
iconClicked
=
true
;
break
;
break
;
case
editorCommon
.
MouseTargetType
.
CONTENT_EMPTY
:
case
editorCommon
.
MouseTargetType
.
CONTENT_EMPTY
:
case
editorCommon
.
MouseTargetType
.
CONTENT_TEXT
:
if
(
range
.
isEmpty
&&
range
.
startColumn
===
model
.
getLineMaxColumn
(
range
.
startLineNumber
))
{
if
(
range
.
isEmpty
&&
range
.
startColumn
===
model
.
getLineMaxColumn
(
range
.
startLineNumber
))
{
break
;
break
;
}
}
...
...
src/vs/editor/contrib/folding/common/foldingModel.ts
浏览文件 @
2f1285a1
...
@@ -72,7 +72,7 @@ export class CollapsibleRegion {
...
@@ -72,7 +72,7 @@ export class CollapsibleRegion {
if
(
this
.
_isCollapsed
)
{
if
(
this
.
_isCollapsed
)
{
return
{
return
{
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
stickiness
:
editorCommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
,
inline
ClassName
:
'
inline-folded
'
,
afterContent
ClassName
:
'
inline-folded
'
,
linesDecorationsClassName
:
'
folding collapsed
'
linesDecorationsClassName
:
'
folding collapsed
'
};
};
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录