Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3c14dfe7
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,发现更多精彩内容 >>
提交
3c14dfe7
编写于
7月 13, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor should not handle all draggable objects (fixes #9179)
上级
4d85f2ed
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
13 deletion
+29
-13
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
...workbench/browser/parts/editor/sideBySideEditorControl.ts
+28
-13
src/vs/workbench/electron-browser/window.ts
src/vs/workbench/electron-browser/window.ts
+1
-0
未找到文件。
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
浏览文件 @
3c14dfe7
...
...
@@ -15,6 +15,7 @@ import {Sash, ISashEvent, IVerticalSashLayoutProvider} from 'vs/base/browser/ui/
import
{
ProgressBar
}
from
'
vs/base/browser/ui/progressbar/progressbar
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
DOM
=
require
(
'
vs/base/browser/dom
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
...
@@ -763,11 +764,23 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
const
overlayId
=
'
monaco-workbench-editor-drop-overlay
'
;
const
splitToPropertyKey
=
'
splitToPosition
'
;
const
stacks
=
this
.
editorGroupService
.
getStacksModel
();
let
overlay
:
Builder
;
let
draggedResources
:
URI
[];
function
cleanUp
():
void
{
draggedResources
=
void
0
;
if
(
overlay
)
{
overlay
.
destroy
();
overlay
=
void
0
;
}
}
function
onDrop
(
e
:
DragEvent
,
position
:
Position
,
splitTo
?:
Position
):
void
{
const
droppedResources
=
draggedResources
;
DOM
.
removeClass
(
node
,
'
dropfeedback
'
);
destroyOverlay
();
cleanUp
();
const
editorService
=
$this
.
editorService
;
const
groupService
=
$this
.
editorGroupService
;
...
...
@@ -816,7 +829,6 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// Check for URI transfer
else
{
const
droppedResources
=
extractResources
(
e
).
filter
(
r
=>
r
.
scheme
===
'
file
'
||
r
.
scheme
===
'
untitled
'
);
if
(
droppedResources
.
length
)
{
window
.
focus
();
// make sure this window has focus so that the open call reaches the right window!
...
...
@@ -834,13 +846,6 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
}
}
function
destroyOverlay
():
void
{
if
(
overlay
)
{
overlay
.
destroy
();
overlay
=
void
0
;
}
}
function
positionOverlay
(
e
:
DragEvent
,
groups
:
number
,
position
:
Position
):
void
{
const
target
=
<
HTMLElement
>
e
.
target
;
const
posXOnOverlay
=
e
.
offsetX
;
...
...
@@ -941,7 +946,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
});
overlay
.
on
([
DOM
.
EventType
.
DRAG_LEAVE
,
DOM
.
EventType
.
DRAG_END
],
()
=>
{
destroyOverlay
();
cleanUp
();
});
// Under some circumstances we have seen reports where the drop overlay is not being
...
...
@@ -953,7 +958,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// actual DROP event that can also trigger a mouse over event.
overlay
.
once
(
DOM
.
EventType
.
MOUSE_OVER
,
()
=>
{
setTimeout
(()
=>
{
destroyOverlay
();
cleanUp
();
},
100
);
});
}
...
...
@@ -973,6 +978,16 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// Drag over
this
.
toDispose
.
push
(
DOM
.
addDisposableListener
(
node
,
DOM
.
EventType
.
DRAG_OVER
,
(
e
:
DragEvent
)
=>
{
// Upon first drag, detect the dragged resources and only take valid ones
if
(
!
draggedResources
)
{
draggedResources
=
extractResources
(
e
).
filter
(
r
=>
r
.
scheme
===
'
file
'
||
r
.
scheme
===
'
untitled
'
);
}
if
(
!
draggedResources
.
length
&&
!
TitleControl
.
getDraggedEditor
())
{
return
;
// do not show drop feedback if we drag invalid resources or no tab around
}
if
(
e
.
target
===
node
)
{
DOM
.
addClass
(
node
,
'
dropfeedback
'
);
}
...
...
@@ -980,7 +995,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
const
target
=
<
HTMLElement
>
e
.
target
;
if
(
target
)
{
if
(
overlay
&&
target
.
id
!==
overlayId
)
{
destroyOverlay
();
// somehow we managed to move the mouse quickly out of the current overlay, so destroy it
cleanUp
();
// somehow we managed to move the mouse quickly out of the current overlay, so destroy it
}
createOverlay
(
target
);
...
...
@@ -999,7 +1014,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
[
node
,
window
].
forEach
(
container
=>
{
this
.
toDispose
.
push
(
DOM
.
addDisposableListener
(
container
,
DOM
.
EventType
.
DRAG_END
,
(
e
:
DragEvent
)
=>
{
DOM
.
removeClass
(
node
,
'
dropfeedback
'
);
destroyOverlay
();
cleanUp
();
}));
});
}
...
...
src/vs/workbench/electron-browser/window.ts
浏览文件 @
3c14dfe7
...
...
@@ -80,6 +80,7 @@ export class ElectronWindow {
function
cleanUp
():
void
{
draggedExternalResources
=
void
0
;
if
(
dropOverlay
)
{
dropOverlay
.
destroy
();
dropOverlay
=
void
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录