Fix lagging behind draw call

spcl · Jun 5, 2024 · d981c3e · d981c3e
1 parent 75eb212
commit d981c3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 34 deletions.
diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts
@@ -300,6 +300,9 @@ export class SDFGRenderer extends EventEmitter {
         this.on('selection_changed', () => {
             this.on_selection_changed();
         });
+        this.on('graph_edited', () => {
+            this.draw_async();
+        });
     }
 
     public destroy(): void {
@@ -1133,9 +1136,8 @@ export class SDFGRenderer extends EventEmitter {
             this.add_loading_animation();
             setTimeout(() => {
                 this.relayout();
+                this.draw_async();
             }, 10);
-
-            this.draw_async();
         }
     }
 
@@ -1475,9 +1477,8 @@ export class SDFGRenderer extends EventEmitter {
             // to reload the dom with the above loader element.
             setTimeout(() => {
                 this.relayout();
+                this.draw_async();
             }, 10);
-
-            this.draw_async();
         }
     }
 
@@ -1497,9 +1498,8 @@ export class SDFGRenderer extends EventEmitter {
         // to reload the dom with the above loader element.
         setTimeout(() => {
             this.relayout();
+            this.draw_async();
         }, 10);
-
-        this.draw_async();
     }
 
     public expandNextLevel(): void {
@@ -1523,9 +1523,8 @@ export class SDFGRenderer extends EventEmitter {
         // to reload the dom with the above loader element.
         setTimeout(() => {
             this.relayout();
+            this.draw_async();
         }, 10);
-
-        this.draw_async();
     }
 
     public expandAll(): void {
@@ -1544,9 +1543,8 @@ export class SDFGRenderer extends EventEmitter {
         // to reload the dom with the above loader element.
         setTimeout(() => {
             this.relayout();
+            this.draw_async();
         }, 10);
-
-        this.draw_async();
     }
 
     public reset_positions(): void {
@@ -1563,9 +1561,8 @@ export class SDFGRenderer extends EventEmitter {
         // to reload the dom with the above loader element.
         setTimeout(() => {
             this.relayout();
+            this.draw_async();
         }, 10);
-
-        this.draw_async();
     }
 
     // Save functions
@@ -2782,6 +2779,7 @@ export class SDFGRenderer extends EventEmitter {
             this.add_loading_animation();
             setTimeout(() => {
                 this.relayout();
+                this.draw_async();
             }, 10);
 
             return true;
@@ -3714,11 +3712,12 @@ export class SDFGRenderer extends EventEmitter {
                     this.add_loading_animation();
                     setTimeout(() => {
                         this.relayout();
+                        this.draw_async();
                     }, 10);
+                } else {
+                    this.draw_async();
                 }
 
-                this.draw_async();
-
                 if (element_moved)
                     this.emit('element_position_changed', 'manual_move');
             } else if (this.mouse_mode === 'add') {

diff --git a/src/renderer/renderer_elements.ts b/src/renderer/renderer_elements.ts
@@ -685,25 +685,6 @@ export class State extends BasicBlock {
 
         if (mousepos && this.intersect(mousepos.x, mousepos.y))
             renderer.set_tooltip((c) => this.tooltip(c));
-
-        // Draw state name in center without contents (does not look good)
-        /*
-        let FONTSIZE = Math.min(
-            renderer.canvas_manager.points_per_pixel() * 16, 100
-        );
-        let label = this.label();
-
-        let oldfont = ctx.font;
-        ctx.font = FONTSIZE + "px Arial";
-
-        let textmetrics = ctx.measureText(label);
-        ctx.fillText(
-            label, this.x - textmetrics.width / 2.0,
-            this.y - this.height / 6.0 + FONTSIZE / 2.0
-        );
-
-        ctx.font = oldfont;
-        */
     }
 
     public shade(

diff --git a/src/utils/sdfv_settings.ts b/src/utils/sdfv_settings.ts
@@ -237,13 +237,14 @@ export class SDFVSettings {
             this.renderer?.add_loading_animation();
             setTimeout(() => {
                 this.renderer?.relayout();
+                this.renderer?.draw_async();
             }, 10);
         }
 
         if (setting.redrawUI)
             this.renderer?.initUI();
 
-        if (setting.redraw !== false)
+        if (setting.redraw !== false && !setting.relayout)
             this.renderer?.draw_async();
 
         if (this.renderer?.get_in_vscode())