From 97fb2cdb57b078d58443370029c787a9ef67ccfb Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 5 Jan 2020 22:22:22 +0100 Subject: [PATCH] hintbox: fix init order of setValue() and paint() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d9f404466818eef779372d193f0bc53e9300f30f Author: Thilo Graf Date: 2020-01-05 (Sun, 05 Jan 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/hintbox.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index a434ec7e8..087d205ca 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -8,7 +8,7 @@ Copyright (C) 2008-2009, 2011, 2013 Stefan Seyfried Implementation of CComponent Window class. - Copyright (C) 2014-2016 Thilo Graf 'dbt' + Copyright (C) 2014-2019 Thilo Graf 'dbt' License: GPL @@ -211,19 +211,21 @@ void CHintBox::enableTimeOutBar(bool enable) delete timeout_pb_timer; timeout_pb_timer = NULL; } if(timeout_pb){ + timeout_pb->setValues(100, 100); + timeout_pb->paint0(); delete timeout_pb; timeout_pb = NULL; } return; } if(timeout_pb){ - timeout_pb->paint0(); timeout_pb->setValues(timeout_pb->getValue()+1, 10*timeout); + timeout_pb->paint0(); }else{ timeout_pb = new CProgressBar(); timeout_pb->setType(CProgressBar::PB_TIMESCALE); timeout_pb->setDimensionsAll(ccw_body->getRealXPos(), ccw_body->getRealYPos(), ccw_body->getWidth(), TIMEOUT_BAR_HEIGHT); - timeout_pb->setValues(0, timeout); + timeout_pb->setValues(timeout/10, timeout); if (!timeout_pb_timer) { timeout_pb_timer = new CComponentsTimer(100); const string tn = cc_item_type.name + ":timeout_bar:";