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

change rendering in panel to fix event handelrs (#4082)

Browse Source
This commit is contained in:
Anthony Dresser
2019-02-19 12:48:07 -08:00
committed by GitHub
parent d4704e39ac
commit ccf9bf4613
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sql/base/browser/ui/panel/panel.ts
View File

@@ -36,6 +36,7 @@ export interface IPanelTab {
interface IInternalPanelTab extends IPanelTab { interface IInternalPanelTab extends IPanelTab {
header: HTMLElement; header: HTMLElement;
label: HTMLElement; label: HTMLElement;
body: HTMLElement;
} }
const defaultOptions: IPanelOptions = { const defaultOptions: IPanelOptions = {
@@ -155,15 +156,25 @@ export class TabbedPanel extends Disposable implements IThemable {
this._tabMap.get(this._shownTab).header.setAttribute('aria-selected', 'false'); this._tabMap.get(this._shownTab).header.setAttribute('aria-selected', 'false');
} }
let prevTab = this._tabMap.get(this._shownTab);
if (prevTab) {
prevTab.body.remove();
}
this._shownTab = id; this._shownTab = id;
this.tabHistory.push(id); this.tabHistory.push(id);
qb(this.body).empty();
let tab = this._tabMap.get(this._shownTab); let tab = this._tabMap.get(this._shownTab);
if (!tab.body) {
tab.body = $('.tab-container');
tab.body.style.width = '100%';
tab.body.style.height = '100%';
tab.view.render(tab.body);
}
this.body.appendChild(tab.body);
this.body.setAttribute('aria-labelledby', tab.identifier); this.body.setAttribute('aria-labelledby', tab.identifier);
qb(tab.label).addClass('active'); qb(tab.label).addClass('active');
qb(tab.header).addClass('active'); qb(tab.header).addClass('active');
tab.header.setAttribute('aria-selected', 'true'); tab.header.setAttribute('aria-selected', 'true');
tab.view.render(this.body);
this._onTabChange.fire(id); this._onTabChange.fire(id);
if (this._currentDimensions) { if (this._currentDimensions) {
this._layoutCurrentTab(new Dimension(this._currentDimensions.width, this._currentDimensions.height - this.headersize)); this._layoutCurrentTab(new Dimension(this._currentDimensions.width, this._currentDimensions.height - this.headersize));
@@ -172,11 +183,11 @@ export class TabbedPanel extends Disposable implements IThemable {
public removeTab(tab: PanelTabIdentifier) { public removeTab(tab: PanelTabIdentifier) {
let actualTab = this._tabMap.get(tab); let actualTab = this._tabMap.get(tab);
qb(actualTab.header).destroy();
if (actualTab.view.remove) { if (actualTab.view.remove) {
actualTab.view.remove(); actualTab.view.remove();
} }
qb(this._tabMap.get(tab).header).destroy(); qb(actualTab.header).destroy();
qb(actualTab.body).destroy();
this._tabMap.delete(tab); this._tabMap.delete(tab);
if (this._shownTab === tab) { if (this._shownTab === tab) {
this._shownTab = undefined; this._shownTab = undefined;
@@ -219,7 +230,10 @@ export class TabbedPanel extends Disposable implements IThemable {
private _layoutCurrentTab(dimension: Dimension): void { private _layoutCurrentTab(dimension: Dimension): void {
if (this._shownTab) { if (this._shownTab) {
this._tabMap.get(this._shownTab).view.layout(dimension); let tab = this._tabMap.get(this._shownTab);
tab.body.style.width = dimension.width + 'px';
tab.body.style.height = dimension.height + 'px';
tab.view.layout(dimension);
} }
} }

2
src/sql/workbench/services/connection/browser/media/connectionDialog.css
View File

@@ -29,7 +29,7 @@
margin: 0px 11px; margin: 0px 11px;
} }
.connection-dialog .tabBody { .connection-dialog .tab-container {
overflow: hidden; overflow: hidden;
flex: 1 1; flex: 1 1;
display: flex; display: flex;