From fa9b5b960c96cf74c3cd9dca614b8a8b3aabdfb9 Mon Sep 17 00:00:00 2001 From: Michal Fratczak Date: Wed, 10 Jun 2020 14:36:46 +0200 Subject: [PATCH] Attempt to fix issue with zero-size demod canvas --- code/webClient/js/drawing.js | 20 ++++++++++++++++---- code/webClient/js/gui.js | 1 - 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/webClient/js/drawing.js b/code/webClient/js/drawing.js index 0ca94bb..4d1409d 100644 --- a/code/webClient/js/drawing.js +++ b/code/webClient/js/drawing.js @@ -281,13 +281,25 @@ function DrawDemod(i_canvas, i_demod) function ResizeCanvas(canvas_id) { + // for some reason canvas size has to be checked periodically + // at least when demod canvas is zero in size + // ???? var canvasNode = document.getElementById(canvas_id); var canvasDiv = canvasNode.parentNode; + var canvasDiv_clientWidth = canvasDiv.clientWidth; + var canvasDiv_clientHeight = canvasDiv.clientHeight; - canvasNode.style.width = '100%'; - canvasNode.style.height = '100%'; - canvasNode.width = canvasDiv.clientWidth; - canvasNode.height = canvasDiv.clientHeight; + if(canvasDiv_clientWidth && canvasDiv_clientHeight) { + canvasNode.width = canvasDiv_clientWidth; + canvasNode.height = canvasDiv_clientHeight; + setTimeout(() => { + ResizeCanvas(canvas_id) + }, 60000); + } else { + setTimeout(() => { + ResizeCanvas(canvas_id) + }, 1000); + } } diff --git a/code/webClient/js/gui.js b/code/webClient/js/gui.js index ed0ccff..f2ff9cd 100644 --- a/code/webClient/js/gui.js +++ b/code/webClient/js/gui.js @@ -442,7 +442,6 @@ function HABDEC_BUILD_UI_DemodAndInfo() //
var div_cnt_demodCanvas = document.createElement("div"); div_cnt_demodCanvas.id = "cnt_demodCanvas"; - div_cnt_demodCanvas.style.display= "flex"; div_cnt_demodCanvas.style.height= "128px"; // demod canvas