Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bf20f93a
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bf20f93a
编写于
8月 26, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zap for inline diff actions icon.
上级
977fac4c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
13 deletion
+22
-13
src/vs/editor/browser/widget/inlineDiffMargin.ts
src/vs/editor/browser/widget/inlineDiffMargin.ts
+14
-13
src/vs/editor/browser/widget/media/diffEditor.css
src/vs/editor/browser/widget/media/diffEditor.css
+8
-0
未找到文件。
src/vs/editor/browser/widget/inlineDiffMargin.ts
浏览文件 @
bf20f93a
...
...
@@ -21,7 +21,7 @@ export interface IDiffLinesChange {
}
export
class
InlineDiffMargin
extends
Disposable
{
private
readonly
_
lightBulb
:
HTMLElement
;
private
readonly
_
diffActions
:
HTMLElement
;
constructor
(
marginDomNode
:
HTMLElement
,
...
...
@@ -35,15 +35,16 @@ export class InlineDiffMargin extends Disposable {
// make sure the diff margin shows above overlay.
marginDomNode
.
style
.
zIndex
=
'
10
'
;
this
.
_
lightBulb
=
document
.
createElement
(
'
div
'
);
this
.
_
lightBulb
.
className
=
'
lightbulb-glyph
'
;
this
.
_
lightBulb
.
style
.
position
=
'
absolute
'
;
this
.
_
diffActions
=
document
.
createElement
(
'
div
'
);
this
.
_
diffActions
.
className
=
'
octicon octicon-zap
'
;
this
.
_
diffActions
.
style
.
position
=
'
absolute
'
;
const
lineHeight
=
editor
.
getConfiguration
().
lineHeight
;
const
lineFeed
=
editor
.
getModel
()
!
.
getEOL
();
this
.
_lightBulb
.
style
.
right
=
'
0px
'
;
this
.
_lightBulb
.
style
.
visibility
=
'
hidden
'
;
this
.
_lightBulb
.
style
.
height
=
`
${
lineHeight
}
px`
;
marginDomNode
.
appendChild
(
this
.
_lightBulb
);
this
.
_diffActions
.
style
.
right
=
'
0px
'
;
this
.
_diffActions
.
style
.
visibility
=
'
hidden
'
;
this
.
_diffActions
.
style
.
height
=
`
${
lineHeight
}
px`
;
this
.
_diffActions
.
style
.
lineHeight
=
`
${
lineHeight
}
px`
;
marginDomNode
.
appendChild
(
this
.
_diffActions
);
const
actions
=
[
new
Action
(
...
...
@@ -97,20 +98,20 @@ export class InlineDiffMargin extends Disposable {
}
this
.
_register
(
dom
.
addStandardDisposableListener
(
marginDomNode
,
'
mouseenter
'
,
e
=>
{
this
.
_
lightBulb
.
style
.
visibility
=
'
visible
'
;
this
.
_
diffActions
.
style
.
visibility
=
'
visible
'
;
currentLineNumberOffset
=
this
.
_updateLightBulbPosition
(
marginDomNode
,
e
.
y
,
lineHeight
);
}));
this
.
_register
(
dom
.
addStandardDisposableListener
(
marginDomNode
,
'
mouseleave
'
,
e
=>
{
this
.
_
lightBulb
.
style
.
visibility
=
'
hidden
'
;
this
.
_
diffActions
.
style
.
visibility
=
'
hidden
'
;
}));
this
.
_register
(
dom
.
addStandardDisposableListener
(
marginDomNode
,
'
mousemove
'
,
e
=>
{
currentLineNumberOffset
=
this
.
_updateLightBulbPosition
(
marginDomNode
,
e
.
y
,
lineHeight
);
}));
this
.
_register
(
dom
.
addStandardDisposableListener
(
this
.
_
lightBulb
,
'
mousedown
'
,
e
=>
{
const
{
top
,
height
}
=
dom
.
getDomNodePagePosition
(
this
.
_
lightBulb
);
this
.
_register
(
dom
.
addStandardDisposableListener
(
this
.
_
diffActions
,
'
mousedown
'
,
e
=>
{
const
{
top
,
height
}
=
dom
.
getDomNodePagePosition
(
this
.
_
diffActions
);
let
pad
=
Math
.
floor
(
lineHeight
/
3
)
+
lineHeight
;
this
.
_contextMenuService
.
showContextMenu
({
getAnchor
:
()
=>
{
...
...
@@ -133,7 +134,7 @@ export class InlineDiffMargin extends Disposable {
const
offset
=
y
-
top
;
const
lineNumberOffset
=
Math
.
floor
(
offset
/
lineHeight
);
const
newTop
=
lineNumberOffset
*
lineHeight
;
this
.
_
lightBulb
.
style
.
top
=
`
${
newTop
}
px`
;
this
.
_
diffActions
.
style
.
top
=
`
${
newTop
}
px`
;
return
lineNumberOffset
;
}
}
src/vs/editor/browser/widget/media/diffEditor.css
浏览文件 @
bf20f93a
...
...
@@ -93,3 +93,11 @@
.monaco-editor
.view-zones
.view-lines
.view-line
span
{
display
:
inline-block
;
}
.monaco-editor
.margin-view-zones
.octicon-zap
{
opacity
:
0.7
;
}
.monaco-editor
.margin-view-zones
.octicon-zap
:hover
{
cursor
:
pointer
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录