ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

add listener to change action bar on maximize change (#2505)

Browse Source
This commit is contained in:
Anthony Dresser
2018-09-11 12:42:06 -07:00
committed by GitHub
parent a9a01ae479
commit 8ec09d25ce
2 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/parts/query/editor/actions.ts
View File

@@ -167,13 +167,13 @@ export class MaximizeTableAction extends Action {
} }
} }
export class MinimizeTableAction extends Action { export class RestoreTableAction extends Action {
public static ID = 'grid.minimize'; public static ID = 'grid.restore';
public static LABEL = localize('minimize', 'Minimize'); public static LABEL = localize('restore', 'Restore');
public static ICON = 'exitFullScreen'; public static ICON = 'exitFullScreen';
constructor() { constructor() {
super(MinimizeTableAction.ID, MinimizeTableAction.LABEL, MinimizeTableAction.ICON); super(RestoreTableAction.ID, RestoreTableAction.LABEL, RestoreTableAction.ICON);
} }
public run(context: IGridActionContext): TPromise<boolean> { public run(context: IGridActionContext): TPromise<boolean> {

51
src/sql/parts/query/editor/gridPanel.ts
View File

@@ -12,7 +12,7 @@ import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scr
import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin'; import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';
import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
import { SaveFormat } from 'sql/parts/grid/common/interfaces'; import { SaveFormat } from 'sql/parts/grid/common/interfaces';
import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, MinimizeTableAction, ChartDataAction, ShowQueryPlanAction } from 'sql/parts/query/editor/actions'; import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, RestoreTableAction, ChartDataAction, ShowQueryPlanAction } from 'sql/parts/query/editor/actions';
import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
import { escape } from 'sql/base/common/strings'; import { escape } from 'sql/base/common/strings';
@@ -40,6 +40,7 @@ import { Dimension, getContentWidth } from 'vs/base/browser/dom';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IAction } from 'vs/base/common/actions';
const ROW_HEIGHT = 29; const ROW_HEIGHT = 29;
const HEADER_HEIGHT = 26; const HEADER_HEIGHT = 26;
@@ -326,22 +327,7 @@ class GridTable<T> extends Disposable implements IView {
this.table.style(this.styles); this.table.style(this.styles);
} }
let actions = []; let actions = this.getCurrentActions();
if (this.state.canBeMaximized) {
if (this.state.maximized) {
actions.splice(1, 0, new MinimizeTableAction());
} else {
actions.splice(1, 0, new MaximizeTableAction());
}
}
actions.push(
new SaveResultAction(SaveResultAction.SAVECSV_ID, SaveResultAction.SAVECSV_LABEL, SaveResultAction.SAVECSV_ICON, SaveFormat.CSV),
new SaveResultAction(SaveResultAction.SAVEEXCEL_ID, SaveResultAction.SAVEEXCEL_LABEL, SaveResultAction.SAVEEXCEL_ICON, SaveFormat.EXCEL),
new SaveResultAction(SaveResultAction.SAVEJSON_ID, SaveResultAction.SAVEJSON_LABEL, SaveResultAction.SAVEJSON_ICON, SaveFormat.JSON),
this.instantiationService.createInstance(ChartDataAction)
);
let actionBarContainer = document.createElement('div'); let actionBarContainer = document.createElement('div');
actionBarContainer.style.width = ACTIONBAR_WIDTH + 'px'; actionBarContainer.style.width = ACTIONBAR_WIDTH + 'px';
@@ -359,6 +345,13 @@ class GridTable<T> extends Disposable implements IView {
} }
}); });
this.actionBar.push(actions, { icon: true, label: false }); this.actionBar.push(actions, { icon: true, label: false });
// change actionbar on maximize change
this.state.onMaximizedChange(e => {
let actions = this.getCurrentActions();
this.actionBar.clear();
this.actionBar.push(actions, { icon: true, label: false });
});
} }
private onTableClick(event: ITableMouseEvent) { private onTableClick(event: ITableMouseEvent) {
@@ -374,6 +367,28 @@ class GridTable<T> extends Disposable implements IView {
} }
} }
private getCurrentActions(): IAction[] {
let actions = [];
if (this.state.canBeMaximized) {
if (this.state.maximized) {
actions.splice(1, 0, new RestoreTableAction());
} else {
actions.splice(1, 0, new MaximizeTableAction());
}
}
actions.push(
new SaveResultAction(SaveResultAction.SAVECSV_ID, SaveResultAction.SAVECSV_LABEL, SaveResultAction.SAVECSV_ICON, SaveFormat.CSV),
new SaveResultAction(SaveResultAction.SAVEEXCEL_ID, SaveResultAction.SAVEEXCEL_LABEL, SaveResultAction.SAVEEXCEL_ICON, SaveFormat.EXCEL),
new SaveResultAction(SaveResultAction.SAVEJSON_ID, SaveResultAction.SAVEJSON_LABEL, SaveResultAction.SAVEJSON_ICON, SaveFormat.JSON),
this.instantiationService.createInstance(ChartDataAction)
);
return actions;
}
public layout(size?: number): void { public layout(size?: number): void {
if (!this.table) { if (!this.table) {
this.build(); this.build();
@@ -439,7 +454,7 @@ class GridTable<T> extends Disposable implements IView {
if (this.state.canBeMaximized) { if (this.state.canBeMaximized) {
if (this.state.maximized) { if (this.state.maximized) {
actions.splice(1, 0, new MinimizeTableAction()); actions.splice(1, 0, new RestoreTableAction());
} else { } else {
actions.splice(1, 0, new MaximizeTableAction()); actions.splice(1, 0, new MaximizeTableAction());
} }