funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 09:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG correction: battery charge is not displayed after exiting game

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-03-14 12:33:36 +01:00
parent 5b51c7de41
commit 290d160677
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
RetroFE/Source/Graphics/Component/Battery.cpp
View File

@ -97,6 +97,7 @@ Battery::Battery(Page &p, Configuration &config, float reloadPeriod, SDL_Color f
, config_(config) , config_(config)
, texture_(NULL) , texture_(NULL)
, texture_prescaled_(NULL) , texture_prescaled_(NULL)
, mustUpdate_(false)
, reloadPeriod_(reloadPeriod) , reloadPeriod_(reloadPeriod)
, scaleX_(scaleX) , scaleX_(scaleX)
, scaleY_(scaleY) , scaleY_(scaleY)
@ -184,6 +185,7 @@ void Battery::allocateGraphicsMemory()
Component::allocateGraphicsMemory(); Component::allocateGraphicsMemory();
mustUpdate_ = true;
} }
void Battery::drawBatteryPercent() void Battery::drawBatteryPercent()
@ -333,7 +335,7 @@ void Battery::update(float dt)
{ {
currentWaitTime_ += dt; currentWaitTime_ += dt;
} }
else if(baseViewInfo.Alpha > 0.0f) else
{ {
prevPercentage_ = percentage_; prevPercentage_ = percentage_;
prevNoBat_ = noBat_; prevNoBat_ = noBat_;
@ -349,26 +351,26 @@ void Battery::update(float dt)
} }
/* Redraw icon if necessary */ /* Redraw icon if necessary */
bool stateChange = ((prevNoBat_ != noBat_) || (prevCharging_ != charging_)); bool stateChange = ((prevNoBat_ != noBat_) || (prevCharging_ != charging_));
if(noBat_){ if(stateChange || mustUpdate_){
if(prevNoBat_ != noBat_ || stateChange){ if(noBat_){
drawNoBattery(); drawNoBattery();
} }
} else if(charging_){
else if(charging_){
if(prevCharging_ != charging_ || stateChange){
drawBatteryCharging(); drawBatteryCharging();
} }
else if(prevPercentage_ != percentage_){
float percentagePixelWidth = percentage_ * BATTERY_FILL_REGION_OFFSET_WIDTH / 100;
float prevPercentagePixelWidth = prevPercentage_ * BATTERY_FILL_REGION_OFFSET_WIDTH / 100;
if (prevPercentagePixelWidth != percentagePixelWidth || stateChange)
{
drawBatteryPercent();
}
}
} }
else if(prevPercentage_ != percentage_ || stateChange){
float percentagePixelWidth = percentage_ * BATTERY_FILL_REGION_OFFSET_WIDTH / 100; mustUpdate_ = false;
float prevPercentagePixelWidth = prevPercentage_ * BATTERY_FILL_REGION_OFFSET_WIDTH / 100;
if (prevPercentagePixelWidth != percentagePixelWidth || stateChange)
{
drawBatteryPercent();
}
}
Component::update(dt); Component::update(dt);
} }
@ -382,7 +384,7 @@ void Battery::draw()
Component::draw(); Component::draw();
if(texture_ && valuesReady_) if(texture_ && valuesReady_ && baseViewInfo.Alpha > 0.0f )
{ {
SDL_Rect rect; SDL_Rect rect;
rect.x = static_cast<int>(baseViewInfo.XRelativeToOrigin()); rect.x = static_cast<int>(baseViewInfo.XRelativeToOrigin());

1
RetroFE/Source/Graphics/Component/Battery.h
View File

@ -31,6 +31,7 @@ protected:
float scaleX_; float scaleX_;
float scaleY_; float scaleY_;
float reloadPeriod_; float reloadPeriod_;
bool mustUpdate_;
static std::string fileUsbConnected_; static std::string fileUsbConnected_;
static std::string fileBatConnected_; static std::string fileBatConnected_;