Redraw tab background color when dragged (#442)

This commit is contained in:
Matt Irvine
2018-01-08 12:40:04 -05:00
committed by GitHub
parent 9e051c6f63
commit 62de97da54

View File

@@ -245,6 +245,17 @@ export class TabsTitleControl extends TitleControl {
element.style.outlineColor = activeContrastBorderColor; element.style.outlineColor = activeContrastBorderColor;
element.style.outlineOffset = null; element.style.outlineOffset = null;
} }
// {{SQL CARBON EDIT}} -- Display the editor's tab color
if (isTab) {
const tabContainer = this.tabsContainer.children[index];
if (tabContainer instanceof HTMLElement) {
let editor = this.context.getEditor(index);
if (editor) {
this.setEditorTabColor(editor, tabContainer, isActiveTab);
}
}
}
} }
public allowDragging(element: HTMLElement): boolean { public allowDragging(element: HTMLElement): boolean {
@@ -335,18 +346,7 @@ export class TabsTitleControl extends TitleControl {
} }
// {{SQL CARBON EDIT}} -- Display the editor's tab color // {{SQL CARBON EDIT}} -- Display the editor's tab color
let sqlEditor = editor as any; this.setEditorTabColor(editor, tabContainer, isTabActive);
if (sqlEditor.tabColor && this.themeService.getTheme().type !== HIGH_CONTRAST) {
tabContainer.style.borderTopColor = sqlEditor.tabColor;
tabContainer.style.borderTopWidth = isTabActive ? '2px' : '1px';
let backgroundColor = Color.Format.CSS.parseHex(sqlEditor.tabColor);
if (backgroundColor) {
tabContainer.style.backgroundColor = backgroundColor.transparent(isTabActive ? 0.3 : 0.2).toString();
}
} else {
tabContainer.style.borderTopColor = '';
tabContainer.style.borderTopWidth = '';
}
} }
}); });
@@ -862,6 +862,22 @@ export class TabsTitleControl extends TitleControl {
return !isCopy || source.id === target.id; return !isCopy || source.id === target.id;
} }
// {{SQL CARBON EDIT}} -- Display the editor's tab color
private setEditorTabColor(editor: IEditorInput, tabContainer: HTMLElement, isTabActive: boolean) {
let sqlEditor = editor as any;
if (sqlEditor.tabColor && this.themeService.getTheme().type !== HIGH_CONTRAST) {
tabContainer.style.borderTopColor = sqlEditor.tabColor;
tabContainer.style.borderTopWidth = isTabActive ? '2px' : '1px';
let backgroundColor = Color.Format.CSS.parseHex(sqlEditor.tabColor);
if (backgroundColor) {
tabContainer.style.backgroundColor = backgroundColor.transparent(isTabActive ? 0.3 : 0.2).toString();
}
} else {
tabContainer.style.borderTopColor = '';
tabContainer.style.borderTopWidth = '';
}
}
} }
class TabActionRunner extends ActionRunner { class TabActionRunner extends ActionRunner {