fixup! fixup! fixup! fixup! fixup! fixup! Disable canvastable dopaint

runbox · Jan 28, 2025 · b9b1467 · b9b1467
1 parent 6eb5a01
commit b9b1467
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -390,7 +390,7 @@ export class AppComponent implements OnInit, AfterViewInit, CanvasTableSelectLis
     } else {
       this.dynamicSearchFieldPlaceHolder = null;
     }
-    this.calculateWidthDependentElements();
+    // this.calculateWidthDependentElements();
   }
 
   ngOnInit(): void {
@@ -754,6 +754,7 @@ export class AppComponent implements OnInit, AfterViewInit, CanvasTableSelectLis
     });
   }
 
+  // TODO: fix this shit
   calculateWidthDependentElements() {
     if (this.toolbarListButtonContainer) {
       const toolbarlistwidth = (this.toolbarListButtonContainer.nativeElement as HTMLDivElement).clientWidth;

diff --git a/src/app/canvastable/canvastable.ts b/src/app/canvastable/canvastable.ts
@@ -26,7 +26,7 @@ import {
   NgModule, Component, AfterViewInit,
   Input, Output,
   ElementRef,
-  DoCheck, EventEmitter, OnInit, ViewChild
+  EventEmitter, OnInit, ViewChild
 } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
@@ -111,8 +111,8 @@ export class CanvasTableComponent implements AfterViewInit, OnInit {
   private canv: HTMLCanvasElement;
 
   // private ctx: CanvasRenderingContext2D;
-  private wantedCanvasWidth = 300;
-  private wantedCanvasHeight = 300;
+  // private wantedCanvasWidth = 300;
+  // private wantedCanvasHeight = 300;
 
   private _rowheight = 28;
   // private fontheight = 14;
@@ -769,11 +769,14 @@ export class CanvasTableComponent implements AfterViewInit, OnInit {
   }
 
   public autoAdjustColumnWidths(minwidth: number, tryFitScreenWidth = false) {
+    // Make innert
+    return
+
     if (!this.canv || this._columns.length === 0) {
       return;
     }
 
-    const canvasWidth = Math.floor(this.wantedCanvasWidth / window.devicePixelRatio) - this.scrollbarwidth - 2;
+    const canvasWidth = Math.floor(window.devicePixelRatio) - this.scrollbarwidth - 2;
 
     const columnsTotalWidth = () => this.columns.reduce((prev, curr) => prev + curr.width, 0);
 

diff --git a/src/app/mailviewer/singlemailviewer.component.ts b/src/app/mailviewer/singlemailviewer.component.ts
@@ -23,8 +23,7 @@ import {
   ViewChildren,
   QueryList,
   ElementRef,
-  AfterViewInit,
-  DoCheck
+  AfterViewInit
 } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import DOMPurify from 'dompurify';
@@ -69,7 +68,7 @@ const TOOLBAR_BUTTON_WIDTH = 30;
   templateUrl: 'singlemailviewer.component.html',
   styleUrls: ['singlemailviewer.component.scss']
 })
-export class SingleMailViewerComponent implements OnInit, DoCheck, AfterViewInit {
+export class SingleMailViewerComponent implements OnInit, AfterViewInit {
 
   _messageId = null; // Message id or filename
 
@@ -243,10 +242,13 @@ export class SingleMailViewerComponent implements OnInit, DoCheck, AfterViewInit
     this.calculateWidthDependentElements();
   }
 
-  ngDoCheck() {
-    this.calculateWidthDependentElements();
-  }
+  // Should be doing it on resize.
+  // ADD THIS BACK TEMPORARY COMMENT OUT.
+  // ngDoCheck() {
+  //   this.calculateWidthDependentElements();
+  // }
 
+  // TODO: This needs to be fixed
   calculateWidthDependentElements() {
     if (this.toolbarButtonContainer) {
       const toolbarwidth = (this.toolbarButtonContainer.nativeElement as HTMLDivElement).clientWidth;