beremiz

SVGHMI: better handling of page switch fade-out.

2022-07-06, Edouard Tisserant
770fcb344f50
Parents c2f7e9bda366
Children 4ee33be5b8b6
SVGHMI: better handling of page switch fade-out.

- In cases or relative jump to current page, page was keeping black after switch.
- Now keep track of undergoing page switch without comparing subscribed page to visible page.
1 files changed, 14 insertions(+), 6 deletions(-)
  • +14 -6
    svghmi/svghmi.js
    • --- a/svghmi/svghmi.js Fri Jun 24 14:56:44 2022 +0200
    +++ b/svghmi/svghmi.js Wed Jul 06 10:39:11 2022 +0200
    @@ -60,8 +60,17 @@
    var requestAnimationFrameID = null;
    function animate() {
    // Do the page swith if any one pending
    - if(current_subscribed_page != current_visible_page){
    - switch_visible_page(current_subscribed_page);
    + if(page_switch_in_progress){
    + if(current_subscribed_page != current_visible_page){
    + switch_visible_page(current_subscribed_page);
    + }
    +
    + page_switch_in_progress = false;
    +
    + if(page_fading_in_progress){
    + svg_root.classList.remove("fade-out-page");
    + page_fading_in_progress = false;
    + }
    }
    while(widget = need_cache_apply.pop()){
    @@ -391,6 +400,7 @@
    var current_subscribed_page;
    var current_page_index;
    var page_node_local_index = hmi_local_index("page_node");
    +var page_switch_in_progress = false;
    function toggleFullscreen() {
    let elem = document.documentElement;
    @@ -418,11 +428,12 @@
    };
    function switch_page(page_name, page_index) {
    - if(current_subscribed_page != current_visible_page){
    + if(page_switch_in_progress){
    /* page switch already going */
    /* TODO LOG ERROR */
    return false;
    }
    + page_switch_in_progress = true;
    if(page_name == undefined)
    page_name = current_subscribed_page;
    @@ -514,9 +525,6 @@
    }
    svg_root.setAttribute('viewBox',new_desc.bbox.join(" "));
    - if(page_fading_in_progress)
    - svg_root.classList.remove("fade-out-page");
    - page_fading_in_progress = false;
    current_visible_page = page_name;
    };