ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab color break caused by VS Code merge (#2761)

Browse Source
This commit is contained in:
Matt Irvine
2018-10-04 15:33:03 -07:00
committed by GitHub
parent 6f39a37656
commit 004464c699
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/parts/editData/common/editDataInput.ts
View File

@@ -186,6 +186,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
this._queryModelService.initializeEdit(this.uri, this.schemaName, this.tableName, this._objectType, rowLimit, queryString); this._queryModelService.initializeEdit(this.uri, this.schemaName, this.tableName, this._objectType, rowLimit, queryString);
this.showResultsEditor(); this.showResultsEditor();
this._onDidChangeLabel.fire();
} }
public onDisconnect(): void { public onDisconnect(): void {

1
src/sql/parts/query/common/queryInput.ts
View File

@@ -246,6 +246,7 @@ export class QueryInput extends EditorInput implements IEncodingSupport, IConnec
} }
} }
this._updateTaskbar.fire(); this._updateTaskbar.fire();
this._onDidChangeLabel.fire();
} }
public onDisconnect(): void { public onDisconnect(): void {

8
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
View File

@@ -868,6 +868,9 @@ export class TabsTitleControl extends TitleControl {
// Dirty State // Dirty State
this.redrawEditorDirty(editor, tabContainer); this.redrawEditorDirty(editor, tabContainer);
// {{SQL CARBON EDIT}} -- Display the editor's tab color
this.setEditorTabColor(editor, tabContainer, this.group.isActive(editor));
} }
private redrawLabel(editor: IEditorInput, tabContainer: HTMLElement, tabLabelWidget: ResourceLabel, tabLabel: IEditorInputLabel): void { private redrawLabel(editor: IEditorInput, tabContainer: HTMLElement, tabLabelWidget: ResourceLabel, tabLabel: IEditorInputLabel): void {
@@ -880,7 +883,8 @@ export class TabsTitleControl extends TitleControl {
tabContainer.title = title; tabContainer.title = title;
// Label // Label
tabLabelWidget.setLabel({ name, description, resource: toResource(editor, { supportSideBySide: true }) }, { extraClasses: ['tab-label'], italic: !this.group.isPinned(editor) }); // {{SQL CARBON EDIT}} -- add title in options passed
tabLabelWidget.setLabel({ name, description, resource: toResource(editor, { supportSideBySide: true }) }, { extraClasses: ['tab-label'], italic: !this.group.isPinned(editor), title });
// {{SQL CARBON EDIT}} -- Display the editor's tab color // {{SQL CARBON EDIT}} -- Display the editor's tab color
const isTabActive = this.group.isActive(editor); const isTabActive = this.group.isActive(editor);
@@ -1105,10 +1109,12 @@ export class TabsTitleControl extends TitleControl {
|| this.themeService.getTheme().type === HIGH_CONTRAST || !sqlEditor.tabColor) { || this.themeService.getTheme().type === HIGH_CONTRAST || !sqlEditor.tabColor) {
tabContainer.style.borderTopColor = ''; tabContainer.style.borderTopColor = '';
tabContainer.style.borderTopWidth = ''; tabContainer.style.borderTopWidth = '';
tabContainer.style.borderTopStyle = '';
return; return;
} }
tabContainer.style.borderTopColor = sqlEditor.tabColor; tabContainer.style.borderTopColor = sqlEditor.tabColor;
tabContainer.style.borderTopWidth = isTabActive ? '3px' : '2px'; tabContainer.style.borderTopWidth = isTabActive ? '3px' : '2px';
tabContainer.style.borderTopStyle = 'solid';
if (tabColorMode === QueryConstants.tabColorModeFill) { if (tabColorMode === QueryConstants.tabColorModeFill) {
let backgroundColor = Color.Format.CSS.parseHex(sqlEditor.tabColor); let backgroundColor = Color.Format.CSS.parseHex(sqlEditor.tabColor);
if (backgroundColor) { if (backgroundColor) {