diff --git a/src/sql/azdata.proposed.d.ts b/src/sql/azdata.proposed.d.ts index 7cc8b0ddfb..fdc5ab7ff6 100644 --- a/src/sql/azdata.proposed.d.ts +++ b/src/sql/azdata.proposed.d.ts @@ -2590,6 +2590,7 @@ declare module 'azdata' { export interface ToolbarComponent { component: Component; title?: string; + toolbarSeparatorAfter?: boolean; } /** diff --git a/src/sql/base/browser/ui/taskbar/media/taskbar.css b/src/sql/base/browser/ui/taskbar/media/taskbar.css index 17fbe09b36..2164b1316e 100644 --- a/src/sql/base/browser/ui/taskbar/media/taskbar.css +++ b/src/sql/base/browser/ui/taskbar/media/taskbar.css @@ -68,9 +68,8 @@ .taskbarSeparator { width: 1px; - background-color:#555; - margin-right: 6px; - margin-top: 3px; + background-color:#A5A5A5; + margin: 6px 8px; } .taskbarTextSeparator { diff --git a/src/sql/parts/modelComponents/toolbarContainer.component.ts b/src/sql/parts/modelComponents/toolbarContainer.component.ts index 275da76e8e..9502492677 100644 --- a/src/sql/parts/modelComponents/toolbarContainer.component.ts +++ b/src/sql/parts/modelComponents/toolbarContainer.component.ts @@ -3,6 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import 'vs/css!./toolbarLayout'; +import 'vs/css!../../../sql/base/browser/ui/taskbar/media/taskbar'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, @@ -18,6 +19,7 @@ import { CommonServiceInterface } from 'sql/services/common/commonServiceInterfa export interface ToolbarItemConfig { title?: string; + toolbarSeparatorAfter?: boolean; } export class ToolbarItem { @@ -37,6 +39,8 @@ export class ToolbarItem { +
+
@@ -85,6 +89,13 @@ export default class ToolbarContainer extends ContainerBase i return this.hasTitle(item) && this.isHorizontal(); } + public shouldShowToolbarSeparator(item: ToolbarItem): boolean { + if (!item || !item.config) { + return false; + } + return item.config.toolbarSeparatorAfter; + } + private hasTitle(item: ToolbarItem): boolean { return item && item.config && item.config.title !== undefined; } diff --git a/src/sql/workbench/api/node/extHostModelView.ts b/src/sql/workbench/api/node/extHostModelView.ts index ecbac8cfdc..05b738d01d 100644 --- a/src/sql/workbench/api/node/extHostModelView.ts +++ b/src/sql/workbench/api/node/extHostModelView.ts @@ -428,7 +428,8 @@ class ToolbarContainerBuilder extends GenericContainerBuilder