Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
944c5bca
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,发现更多精彩内容 >>
提交
944c5bca
编写于
6月 15, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
actionbar cleanup
上级
cf5a15d1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
52 deletion
+12
-52
src/vs/base/browser/ui/actionbar/actionbar.css
src/vs/base/browser/ui/actionbar/actionbar.css
+0
-43
src/vs/base/browser/ui/actionbar/actionbar.ts
src/vs/base/browser/ui/actionbar/actionbar.ts
+12
-9
未找到文件。
src/vs/base/browser/ui/actionbar/actionbar.css
浏览文件 @
944c5bca
...
...
@@ -129,49 +129,6 @@
background-color
:
#C33
;
}
/* Actions widget */
.monaco-actions-widget
{
position
:
relative
;
}
.monaco-actions-widget
.more
{
position
:
absolute
;
top
:
0
;
right
:
1em
;
font-weight
:
bold
;
cursor
:
pointer
;
display
:
none
;
}
.monaco-actions-widget
.more.active
{
-ms-transform
:
translate
(
0
,
-3px
);
-webkit-transform
:
translate
(
0
,
-3px
);
-moz-transform
:
translate
(
0
,
-3px
);
-o-transform
:
translate
(
0
,
-3px
);
transform
:
translate
(
0
,
-3px
);
}
.monaco-actions-widget
.primary
{
display
:
none
;
}
.monaco-actions-widget.hasPrimary
.primary
{
display
:
inherit
;
}
.monaco-actions-widget.hasSecondary
.more
{
display
:
inherit
;
}
.monaco-actions-widget
.secondary.monaco-action-bar
{
display
:
none
;
}
.monaco-actions-widget.more
.secondary.monaco-action-bar
{
display
:
inherit
;
}
/* Action Items */
.monaco-action-bar
.action-item.select-container
{
overflow
:
hidden
;
/* somehow the dropdown overflows its container, we prevent it here to not push */
...
...
src/vs/base/browser/ui/actionbar/actionbar.ts
浏览文件 @
944c5bca
...
...
@@ -49,7 +49,6 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
if
(
action
instanceof
Action
)
{
let
l
=
(
<
Action
>
action
).
addBulkListener2
((
events
:
EmitterEvent
[])
=>
{
if
(
!
this
.
builder
)
{
// we have not been rendered yet, so there
// is no point in updating the UI
...
...
@@ -57,7 +56,6 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
}
events
.
forEach
((
event
:
EmitterEvent
)
=>
{
switch
(
event
.
getType
())
{
case
Action
.
ENABLED
:
this
.
_updateEnabled
();
...
...
@@ -113,20 +111,24 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
this
.
builder
=
$
(
container
);
this
.
gesture
=
new
Gesture
(
container
);
this
.
builder
.
on
(
DOM
.
EventType
.
CLICK
,
(
event
:
Event
)
=>
{
this
.
onClick
(
event
);
}
);
this
.
builder
.
on
(
EventType
.
Tap
,
e
=>
{
this
.
onClick
(
e
);
}
);
this
.
builder
.
on
(
DOM
.
EventType
.
CLICK
,
(
event
:
Event
)
=>
this
.
onClick
(
event
)
);
this
.
builder
.
on
(
EventType
.
Tap
,
e
=>
this
.
onClick
(
e
)
);
if
(
platform
.
isMacintosh
)
{
this
.
builder
.
on
(
DOM
.
EventType
.
CONTEXT_MENU
,
(
event
:
Event
)
=>
{
this
.
onClick
(
event
);
}
);
// https://github.com/Microsoft/vscode/issues/1011
this
.
builder
.
on
(
DOM
.
EventType
.
CONTEXT_MENU
,
(
event
:
Event
)
=>
this
.
onClick
(
event
)
);
// https://github.com/Microsoft/vscode/issues/1011
}
this
.
builder
.
on
(
'
mousedown
'
,
(
e
:
MouseEvent
)
=>
{
this
.
builder
.
on
(
DOM
.
EventType
.
MOUSE_DOWN
,
(
e
:
MouseEvent
)
=>
{
DOM
.
EventHelper
.
stop
(
e
);
if
(
e
.
button
===
0
&&
this
.
_action
.
enabled
)
{
this
.
builder
.
addClass
(
'
active
'
);
}
});
this
.
builder
.
on
([
'
mouseup
'
,
'
mouseout
'
],
(
e
:
MouseEvent
)
=>
{
this
.
builder
.
on
([
DOM
.
EventType
.
MOUSE_UP
,
DOM
.
EventType
.
MOUSE_OUT
],
(
e
:
MouseEvent
)
=>
{
DOM
.
EventHelper
.
stop
(
e
);
if
(
e
.
button
===
0
&&
this
.
_action
.
enabled
)
{
this
.
builder
.
removeClass
(
'
active
'
);
}
...
...
@@ -135,6 +137,7 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
public
onClick
(
event
:
Event
):
void
{
DOM
.
EventHelper
.
stop
(
event
,
true
);
let
context
:
any
;
if
(
types
.
isUndefinedOrNull
(
this
.
_context
))
{
context
=
event
;
...
...
@@ -270,7 +273,7 @@ export class ActionItem extends BaseActionItem {
title
=
this
.
getAction
().
label
;
if
(
this
.
options
.
keybinding
)
{
title
=
nls
.
localize
({
key
:
'
titleLabel
'
,
comment
:
[
'
action title
'
,
'
action keybinding
'
]},
"
{0} ({1})
"
,
title
,
this
.
options
.
keybinding
);
title
=
nls
.
localize
({
key
:
'
titleLabel
'
,
comment
:
[
'
action title
'
,
'
action keybinding
'
]
},
"
{0} ({1})
"
,
title
,
this
.
options
.
keybinding
);
}
}
...
...
@@ -512,7 +515,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
public
setAriaLabel
(
label
:
string
):
void
{
if
(
label
)
{
this
.
actionsList
.
setAttribute
(
'
aria-label
'
,
label
);
}
else
{
}
else
{
this
.
actionsList
.
removeAttribute
(
'
aria-label
'
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录