Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
50767577
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,发现更多精彩内容 >>
提交
50767577
编写于
11月 13, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #83721. Handle pointer events in Color Picker.
上级
8a22996a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
7 deletion
+16
-7
src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
+16
-7
未找到文件。
src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
浏览文件 @
50767577
...
...
@@ -6,7 +6,7 @@
import
'
vs/css!./colorPicker
'
;
import
{
onDidChangeZoomLevel
}
from
'
vs/base/browser/browser
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
GlobalMouseMoveMonitor
,
IStandardMouseMoveEventData
,
standardMouseMoveMerger
}
from
'
vs/base/browser/globalMouseMoveMonitor
'
;
import
{
GlobalMouseMoveMonitor
,
IStandardMouseMoveEventData
,
standardMouseMoveMerger
,
GlobalPointerMoveMonitor
}
from
'
vs/base/browser/globalMouseMoveMonitor
'
;
import
{
Widget
}
from
'
vs/base/browser/ui/widget
'
;
import
{
Color
,
HSVA
,
RGBA
}
from
'
vs/base/common/color
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
...
...
@@ -14,6 +14,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
import
{
ColorPickerModel
}
from
'
vs/editor/contrib/colorPicker/colorPickerModel
'
;
import
{
editorHoverBackground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
IThemeService
,
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
BrowserFeatures
}
from
'
vs/base/browser/canIUse
'
;
const
$
=
dom
.
$
;
...
...
@@ -150,13 +151,17 @@ class SaturationBox extends Disposable {
this
.
layout
();
this
.
_register
(
dom
.
addDisposableListener
(
this
.
domNode
,
dom
.
EventType
.
MOUSE_DOWN
,
e
=>
this
.
onMouseDown
(
e
)));
this
.
_register
(
dom
.
addDisposableListener
(
this
.
domNode
,
BrowserFeatures
.
pointerEvents
?
dom
.
EventType
.
POINTER_DOWN
:
dom
.
EventType
.
MOUSE_DOWN
,
e
=>
this
.
onMouseDown
(
e
)));
this
.
_register
(
this
.
model
.
onDidChangeColor
(
this
.
onDidChangeColor
,
this
));
this
.
monitor
=
null
;
}
private
onMouseDown
(
e
:
MouseEvent
):
void
{
this
.
monitor
=
this
.
_register
(
new
GlobalMouseMoveMonitor
<
IStandardMouseMoveEventData
>
());
this
.
monitor
=
this
.
_register
(
BrowserFeatures
.
pointerEvents
?
new
GlobalPointerMoveMonitor
<
IStandardMouseMoveEventData
>
()
:
new
GlobalMouseMoveMonitor
<
IStandardMouseMoveEventData
>
()
);
const
origin
=
dom
.
getDomNodePagePosition
(
this
.
domNode
);
if
(
e
.
target
!==
this
.
selection
)
{
...
...
@@ -165,7 +170,7 @@ class SaturationBox extends Disposable {
this
.
monitor
.
startMonitoring
(
standardMouseMoveMerger
,
event
=>
this
.
onDidChangePosition
(
event
.
posx
-
origin
.
left
,
event
.
posy
-
origin
.
top
),
()
=>
null
);
const
mouseUpListener
=
dom
.
addDisposableListener
(
document
,
dom
.
EventType
.
MOUSE_UP
,
()
=>
{
const
mouseUpListener
=
dom
.
addDisposableListener
(
document
,
BrowserFeatures
.
pointerEvents
?
dom
.
EventType
.
POINTER_UP
:
dom
.
EventType
.
MOUSE_UP
,
()
=>
{
this
.
_onColorFlushed
.
fire
();
mouseUpListener
.
dispose
();
if
(
this
.
monitor
)
{
...
...
@@ -250,7 +255,7 @@ abstract class Strip extends Disposable {
this
.
slider
=
dom
.
append
(
this
.
domNode
,
$
(
'
.slider
'
));
this
.
slider
.
style
.
top
=
`0px`
;
this
.
_register
(
dom
.
addDisposableListener
(
this
.
domNode
,
dom
.
EventType
.
MOUSE_DOWN
,
e
=>
this
.
onMouseDown
(
e
)));
this
.
_register
(
dom
.
addDisposableListener
(
this
.
domNode
,
BrowserFeatures
.
pointerEvents
?
dom
.
EventType
.
POINTER_DOWN
:
dom
.
EventType
.
MOUSE_DOWN
,
e
=>
this
.
onMouseDown
(
e
)));
this
.
layout
();
}
...
...
@@ -262,7 +267,11 @@ abstract class Strip extends Disposable {
}
private
onMouseDown
(
e
:
MouseEvent
):
void
{
const
monitor
=
this
.
_register
(
new
GlobalMouseMoveMonitor
<
IStandardMouseMoveEventData
>
());
const
monitor
=
this
.
_register
(
BrowserFeatures
.
pointerEvents
?
new
GlobalPointerMoveMonitor
<
IStandardMouseMoveEventData
>
()
:
new
GlobalMouseMoveMonitor
<
IStandardMouseMoveEventData
>
()
);
const
origin
=
dom
.
getDomNodePagePosition
(
this
.
domNode
);
dom
.
addClass
(
this
.
domNode
,
'
grabbing
'
);
...
...
@@ -272,7 +281,7 @@ abstract class Strip extends Disposable {
monitor
.
startMonitoring
(
standardMouseMoveMerger
,
event
=>
this
.
onDidChangeTop
(
event
.
posy
-
origin
.
top
),
()
=>
null
);
const
mouseUpListener
=
dom
.
addDisposableListener
(
document
,
dom
.
EventType
.
MOUSE_UP
,
()
=>
{
const
mouseUpListener
=
dom
.
addDisposableListener
(
document
,
BrowserFeatures
.
pointerEvents
?
dom
.
EventType
.
POINTER_UP
:
dom
.
EventType
.
MOUSE_UP
,
()
=>
{
this
.
_onColorFlushed
.
fire
();
mouseUpListener
.
dispose
();
monitor
.
stopMonitoring
(
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录