properties isn't scrolling (#1225)

This commit is contained in:
Anthony Dresser
2018-04-23 17:41:24 -07:00
committed by Karl Burtram
parent 30a825438e
commit 7fb8a28b59
2 changed files with 12 additions and 14 deletions

View File

@@ -20,26 +20,24 @@ import { ConfigurationTarget } from 'vs/platform/configuration/common/configurat
selector: 'dashboard-home-container', selector: 'dashboard-home-container',
providers: [{ provide: DashboardTab, useExisting: forwardRef(() => DashboardHomeContainer) }], providers: [{ provide: DashboardTab, useExisting: forwardRef(() => DashboardHomeContainer) }],
template: ` template: `
<dashboard-widget-wrapper #propertiesClass *ngIf="properties" [collapsable]="true" [_config]="properties" <div class="fullsize" style="display: flex; flex-direction: column">
style="padding-left: 10px; padding-right: 10px; display: block" [style.height.px]="_propertiesClass?.collapsed ? '30' : '90'"> <dashboard-widget-wrapper #propertiesClass *ngIf="properties" [collapsable]="true" [_config]="properties"
</dashboard-widget-wrapper> style="padding-left: 10px; padding-right: 10px; display: block; flex: 0" [style.height.px]="_propertiesClass?.collapsed ? '30' : '90'">
<widget-content [widgets]="widgets" [originalConfig]="tab.originalConfig" [context]="tab.context"> </dashboard-widget-wrapper>
</widget-content> <widget-content style="flex: 1" [widgets]="widgets" [originalConfig]="tab.originalConfig" [context]="tab.context">
</widget-content>
</div>
` `
}) })
export class DashboardHomeContainer extends DashboardWidgetContainer { export class DashboardHomeContainer extends DashboardWidgetContainer {
@Input() private properties: WidgetConfig; @Input() private properties: WidgetConfig;
@ViewChild('propertiesClass') private _propertiesClass: DashboardWidgetWrapper; @ViewChild('propertiesClass') private _propertiesClass: DashboardWidgetWrapper;
private dashboardService: DashboardServiceInterface;
constructor( constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) _cd: ChangeDetectorRef, @Inject(forwardRef(() => ChangeDetectorRef)) _cd: ChangeDetectorRef,
@Inject(forwardRef(() => CommonServiceInterface)) protected commonService: CommonServiceInterface, @Inject(forwardRef(() => CommonServiceInterface)) protected dashboardService: DashboardServiceInterface
) { ) {
super(_cd); super(_cd);
this.dashboardService = commonService as DashboardServiceInterface;
} }
ngAfterContentInit() { ngAfterContentInit() {

View File

@@ -28,9 +28,9 @@ import Event, { Emitter } from 'vs/base/common/event';
</widget-content> </widget-content>
` `
}) })
export class DashboardWidgetContainer extends DashboardTab implements OnDestroy, OnChanges, AfterContentInit { export class DashboardWidgetContainer extends DashboardTab implements OnDestroy, AfterContentInit {
@Input() private tab: TabConfig; @Input() protected tab: TabConfig;
private widgets: WidgetConfig[]; protected widgets: WidgetConfig[];
private _onResize = new Emitter<void>(); private _onResize = new Emitter<void>();
public readonly onResize: Event<void> = this._onResize.event; public readonly onResize: Event<void> = this._onResize.event;
@@ -42,7 +42,7 @@ export class DashboardWidgetContainer extends DashboardTab implements OnDestroy,
super(); super();
} }
ngOnChanges() { ngOnInit() {
if (this.tab.container) { if (this.tab.container) {
this.widgets = Object.values(this.tab.container)[0]; this.widgets = Object.values(this.tab.container)[0];
this._cd.detectChanges(); this._cd.detectChanges();