提交 29507354 编写于 作者: B Benjamin Pasero

Remove chevron when there is no overflow condition (fixes #6881)

上级 e8d8c533
......@@ -875,6 +875,8 @@ export class ShowEditorsInLeftGroupAction extends QuickOpenAction {
@IWorkbenchEditorService private editorService: IWorkbenchEditorService
) {
super(actionId, actionLabel, NAVIGATE_IN_LEFT_GROUP_PREFIX, quickOpenService);
this.class = 'show-group-editors-action';
}
}
......@@ -892,6 +894,8 @@ export class ShowEditorsInCenterGroupAction extends QuickOpenAction {
@IWorkbenchEditorService private editorService: IWorkbenchEditorService
) {
super(actionId, actionLabel, NAVIGATE_IN_CENTER_GROUP_PREFIX, quickOpenService);
this.class = 'show-group-editors-action';
}
}
......@@ -909,6 +913,8 @@ export class ShowEditorsInRightGroupAction extends QuickOpenAction {
@IWorkbenchEditorService private editorService: IWorkbenchEditorService
) {
super(actionId, actionLabel, NAVIGATE_IN_RIGHT_GROUP_PREFIX, quickOpenService);
this.class = 'show-group-editors-action';
}
}
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:#C5C5C5;}
</style>
<path id="iconBg" class="st0" d="M5.3,5.3L4.4,6.2L8,9.8l3.9-3.6L11,5.3L8,8C8,8,5.3,5.3,5.3,5.3z"/>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:#656565;}
</style>
<path id="iconBg" class="st0" d="M5.3,5.3L4.4,6.2L8,9.8l3.9-3.6L11,5.3L8,8C8,8,5.3,5.3,5.3,5.3z"/>
</svg>
......@@ -204,11 +204,15 @@
}
.monaco-workbench .show-group-editors-action {
background: url('chevron-disabled.svg') center center no-repeat;
background: url('chevron.svg') center center no-repeat;
}
.monaco-workbench .show-group-editors-action-hidden {
display: none;
}
.vs-dark .monaco-workbench .show-group-editors-action {
background: url('chevron-disabled-inverse.svg') center center no-repeat;
background: url('chevron-inverse.svg') center center no-repeat;
}
/* High Contrast Theming */
......@@ -216,7 +220,6 @@
.hc-black .monaco-workbench .close-editor-action,
.hc-black .monaco-workbench .close-editor-dirty-action,
.hc-black .monaco-workbench .show-group-editors-action,
.hc-black .monaco-workbench .show-group-editors-overflowing-action,
.hc-black .monaco-workbench .split-editor-action {
background: none;
}
......@@ -225,17 +228,8 @@
width: 24px;
}
.hc-black .monaco-workbench .show-group-editors-overflowing-action:before {
content: url('chevron-inverse.svg');
position: absolute;
top: 12px;
left: 8px;
height: 16px;
width: 16px;
}
.hc-black .monaco-workbench .show-group-editors-action:before {
content: url('chevron-disabled-inverse.svg');
content: url('chevron-inverse.svg');
position: absolute;
top: 12px;
left: 8px;
......
......@@ -1222,10 +1222,12 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
// Overflow
const isOverflowing = state.editorCount > 1;
const showEditorAction = this.showEditorsOfGroup[state.position];
if (isOverflowing) {
showEditorAction.class = 'show-group-editors-overflowing-action';
if (!isOverflowing) {
showEditorAction.class = 'show-group-editors-overflowing-action-hidden';
showEditorAction.enabled = false;
} else {
showEditorAction.class = 'show-group-editors-action';
showEditorAction.enabled = true;
}
}
}
......@@ -1309,13 +1311,11 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
primaryActions.unshift(this.splitEditorAction);
}
const showEditorAction = this.showEditorsOfGroup[position];
if (isOverflowing) {
showEditorAction.class = 'show-group-editors-overflowing-action';
} else {
showEditorAction.class = 'show-group-editors-action';
this.showEditorsOfGroup[position].class = 'show-group-editors-action';
this.showEditorsOfGroup[position].enabled = true;
primaryActions.unshift(this.showEditorsOfGroup[position]);
}
primaryActions.unshift(this.showEditorsOfGroup[position]);
// Secondary Actions
if (secondaryActions.length) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册