diff --git a/src/app/components/section-canvas/section-canvas.component.ts b/src/app/components/section-canvas/section-canvas.component.ts index 434a8428bbafa5088d195cbc19a53486c1d385a6..41364eac3afb02d9d0c18364d1494b1460973bdb 100644 --- a/src/app/components/section-canvas/section-canvas.component.ts +++ b/src/app/components/section-canvas/section-canvas.component.ts @@ -73,18 +73,17 @@ export class SectionCanvasComponent extends ResultsComponentDirective implements @Input() public set size(s: number) { this._size = s; - console.log("(i) size set to", this._size); } // redessine le canvas chaque fois qu'une entrée change public ngOnChanges() { - console.log("XXX section canvas on changes"); - this.draw(); + setTimeout(() => { + this.draw(); + }, 10); } public ngAfterViewInit() { // wait for the view to init before using the element this._context2d = this._calcCanvas.nativeElement.getContext("2d"); - console.log("<<<< after view init >>>"); this.draw(); } @@ -113,7 +112,7 @@ export class SectionCanvasComponent extends ResultsComponentDirective implements } public draw() { - console.log(">> redrawing at size", this._size); + // console.log(">> redrawing at size", this._size); if (this._context2d && this._section) { this.reset(); diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts index 0893a387f0132b851ff7d7390a1ed8732a51ba63..4f867f29bf897ff1623342b90b4ab0bdc02b0a95 100644 --- a/src/app/components/section-results/section-results.component.ts +++ b/src/app/components/section-results/section-results.component.ts @@ -77,7 +77,6 @@ export class SectionResultsComponent extends ResultsComponentDirective { private getContainerSize(useDefaultSize: boolean = false, useMinOfWidthAndHeight: boolean = false): number { const container = this.element.nativeElement.querySelector(".section-results-container"); - console.log("[container size in getContainerSize]", container.offsetWidth, container.offsetHeight); let size: number; if (container) { if (useMinOfWidthAndHeight) { @@ -93,11 +92,14 @@ export class SectionResultsComponent extends ResultsComponentDirective { // when going back from fullscreen mode, container size tends to be // too high for whatever reason; use defaultSize on this purpose if (useDefaultSize) { - console.log("~~ use default ~~", size, this.defaultSize); size = this.defaultSize; } // lower boundary size = Math.max(size, this.minimalSize); + // remove 10% in "fullscreen" mode + if (size > this.minimalSize) { + size = Math.max(size * 0.9, this.minimalSize); + } return size; }