Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c6e27312
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,发现更多精彩内容 >>
提交
c6e27312
编写于
6月 28, 2016
作者:
D
Don Jayamanne
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/microsoft/vscode
上级
d452f8d2
ef99c39a
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
40 addition
and
8 deletion
+40
-8
src/vs/base/browser/ui/list/rowCache.ts
src/vs/base/browser/ui/list/rowCache.ts
+1
-1
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
...editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+7
-1
src/vs/workbench/browser/parts/editor/media/editorPicker.css
src/vs/workbench/browser/parts/editor/media/editorPicker.css
+4
-1
src/vs/workbench/browser/parts/editor/media/titlecontrol.css
src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+5
-0
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
...workbench/browser/parts/editor/sideBySideEditorControl.ts
+1
-1
src/vs/workbench/browser/workbench.ts
src/vs/workbench/browser/workbench.ts
+2
-1
src/vs/workbench/parts/debug/browser/media/debug.contribution.css
...orkbench/parts/debug/browser/media/debug.contribution.css
+4
-0
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
+5
-0
src/vs/workbench/parts/files/browser/media/explorerviewlet.css
...s/workbench/parts/files/browser/media/explorerviewlet.css
+2
-3
src/vs/workbench/parts/git/browser/media/git.contribution.css
...vs/workbench/parts/git/browser/media/git.contribution.css
+4
-0
src/vs/workbench/parts/search/browser/media/searchviewlet.css
...vs/workbench/parts/search/browser/media/searchviewlet.css
+5
-0
未找到文件。
src/vs/base/browser/ui/list/rowCache.ts
浏览文件 @
c6e27312
...
...
@@ -60,7 +60,7 @@ export class RowCache<T> implements IDisposable {
* scrolling).
*/
release
(
row
:
IRow
):
void
{
if
(
!
row
.
domNode
)
{
if
(
!
row
)
{
return
;
}
...
...
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
浏览文件 @
c6e27312
...
...
@@ -236,7 +236,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
this
.
toUnhook
.
push
(
this
.
editor
.
onKeyDown
((
e
:
IKeyboardEvent
)
=>
this
.
onEditorKeyDown
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
onKeyUp
((
e
:
IKeyboardEvent
)
=>
this
.
onEditorKeyUp
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
onDidChangeCursorSelection
((
e
)
=>
this
.
resetHandler
()));
// https://github.com/Microsoft/vscode/issues/7827
this
.
toUnhook
.
push
(
this
.
editor
.
onDidChangeCursorSelection
((
e
)
=>
this
.
onDidChangeCursorSelection
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
onDidChangeModel
((
e
)
=>
this
.
resetHandler
()));
this
.
toUnhook
.
push
(
this
.
editor
.
onDidChangeModelContent
(()
=>
this
.
resetHandler
()));
this
.
toUnhook
.
push
(
this
.
editor
.
onDidScrollChange
((
e
)
=>
{
...
...
@@ -246,6 +246,12 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
}));
}
private
onDidChangeCursorSelection
(
e
:
editorCommon
.
ICursorSelectionChangedEvent
):
void
{
if
(
e
.
selection
&&
e
.
selection
.
startColumn
!==
e
.
selection
.
endColumn
)
{
this
.
resetHandler
();
// immediately stop this feature if the user starts to select (https://github.com/Microsoft/vscode/issues/7827)
}
}
private
onEditorMouseMove
(
mouseEvent
:
IEditorMouseEvent
,
withKey
?:
IKeyboardEvent
):
void
{
this
.
lastMouseMoveEvent
=
mouseEvent
;
...
...
src/vs/workbench/browser/parts/editor/media/editorPicker.css
浏览文件 @
c6e27312
...
...
@@ -5,5 +5,8 @@
.monaco-workbench
.quick-open-widget
.quick-open-tree
.quick-open-entry.editor-preview
{
font-style
:
italic
;
padding-left
:
1px
;
/* we need to push the label a bit to accomodate for the italic style */
}
.monaco-workbench.mac
.quick-open-widget
.quick-open-tree
.quick-open-entry.editor-preview
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
\ No newline at end of file
src/vs/workbench/browser/parts/editor/media/titlecontrol.css
浏览文件 @
c6e27312
...
...
@@ -12,6 +12,11 @@
font-style
:
italic
;
}
.monaco-workbench.mac
>
.part.editor
>
.content
>
.one-editor-container
>
.title
.title-label
,
.monaco-workbench.mac
>
.part.editor
>
.content
>
.one-editor-container
>
.title
.tabs-container
>
.tab
.tab-label
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
.monaco-workbench
>
.part.editor
>
.content
>
.one-editor-container
>
.title.pinned
.title-label
,
.monaco-workbench
>
.part.editor
>
.content
>
.one-editor-container
>
.title
.tabs-container
>
.tab.pinned
.tab-label
{
font-style
:
normal
;
...
...
src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts
浏览文件 @
c6e27312
...
...
@@ -190,7 +190,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
private
onExtensionsReady
():
void
{
// Up to date title areas
POSITIONS
.
forEach
(
position
=>
this
.
titleAreaControl
[
position
].
refresh
());
POSITIONS
.
forEach
(
position
=>
this
.
titleAreaControl
[
position
].
update
());
}
private
onStacksChanged
(
e
:
IStacksModelChangeEvent
):
void
{
...
...
src/vs/workbench/browser/workbench.ts
浏览文件 @
c6e27312
...
...
@@ -19,6 +19,7 @@ import timer = require('vs/base/common/timer');
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
Identifiers
}
from
'
vs/workbench/common/constants
'
;
import
{
isWindows
,
isLinux
}
from
'
vs/base/common/platform
'
;
import
{
IOptions
}
from
'
vs/workbench/common/options
'
;
import
{
IWorkbenchContributionsRegistry
,
Extensions
as
WorkbenchExtensions
}
from
'
vs/workbench/common/contributions
'
;
import
{
IEditorRegistry
,
Extensions
as
EditorExtensions
,
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
...
...
@@ -699,7 +700,7 @@ export class Workbench implements IPartService {
// Create Workbench DIV Off-DOM
this
.
workbenchContainer
=
$
(
'
.monaco-workbench-container
'
);
this
.
workbench
=
$
().
div
({
'
class
'
:
'
monaco-workbench
'
,
id
:
Identifiers
.
WORKBENCH_CONTAINER
}).
appendTo
(
this
.
workbenchContainer
);
this
.
workbench
=
$
().
div
({
'
class
'
:
'
monaco-workbench
'
+
(
isWindows
?
'
windows
'
:
isLinux
?
'
linux
'
:
'
mac
'
)
,
id
:
Identifiers
.
WORKBENCH_CONTAINER
}).
appendTo
(
this
.
workbenchContainer
);
}
private
renderWorkbench
():
void
{
...
...
src/vs/workbench/parts/debug/browser/media/debug.contribution.css
浏览文件 @
c6e27312
...
...
@@ -186,6 +186,10 @@
font-style
:
italic
;
}
.monaco-workbench.mac
.monaco-tree-row
.expression
.unavailable
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
.monaco-workbench
.monaco-tree-row
:not
(
.selected
)
.expression
.error
{
color
:
#E51400
;
}
...
...
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
浏览文件 @
c6e27312
...
...
@@ -197,6 +197,11 @@
overflow
:
hidden
;
}
.monaco-workbench.mac
.debug-viewlet
.debug-call-stack
.load-more
,
.monaco-workbench.mac
.debug-viewlet
.debug-call-stack
.error
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
/* Variables & Expression view */
.debug-viewlet
.scope
{
...
...
src/vs/workbench/parts/files/browser/media/explorerviewlet.css
浏览文件 @
c6e27312
...
...
@@ -111,11 +111,10 @@
.explorer-viewlet
.explorer-open-editors
.monaco-tree
.monaco-tree-row
.open-editor.preview
{
font-style
:
italic
;
padding-left
:
1px
;
/* we need to push the label a bit to accomodate for the italic style */
}
.
explorer-viewlet
.explorer-open-editors
.monaco-tree
.monaco-tree-row
>
.content
>
.open-editor.preview
{
margin-left
:
0px
;
/* accomodate for 1px padding
*/
.
monaco-workbench.mac
.explorer-viewlet
.explorer-open-editors
.monaco-tree
.monaco-tree-row
.open-editor.preview
{
font-weight
:
300
;
/* makes the italic font appear the same as normal
*/
}
/* Theming */
...
...
src/vs/workbench/parts/git/browser/media/git.contribution.css
浏览文件 @
c6e27312
...
...
@@ -224,4 +224,8 @@
.monaco-shell
.git-statusbar-group
>
.git-statusbar-branch-item.headless
{
font-style
:
italic
;
}
.monaco-shell
.monaco-workbench.mac
.git-statusbar-group
>
.git-statusbar-branch-item.headless
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
\ No newline at end of file
src/vs/workbench/parts/search/browser/media/searchviewlet.css
浏览文件 @
c6e27312
...
...
@@ -209,6 +209,11 @@ hc-black .search-viewlet .action-replace,
font-style
:
italic
;
}
.monaco-workbench.mac
.search-viewlet
.label
,
.monaco-workbench.mac
.search-viewlet
.linematch.changedOrRemoved
{
font-weight
:
300
;
/* makes the italic font appear the same as normal */
}
.search-viewlet
.monaco-count-badge
{
margin-right
:
12px
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录