RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed goto in update method

pull/1484/head
Erik Reider 2022-03-20 00:36:13 +01:00
parent 2633ff3fb9
commit 7b071567ea
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/upower/upower.cpp
View File

@ -277,24 +277,6 @@ auto UPower::update() -> void {
bool displayDeviceValid = bool displayDeviceValid =
kind == UpDeviceKind::UP_DEVICE_KIND_BATTERY || kind == UpDeviceKind::UP_DEVICE_KIND_UPS; kind == UpDeviceKind::UP_DEVICE_KIND_BATTERY || kind == UpDeviceKind::UP_DEVICE_KIND_UPS;
std::string percentString = "";
uint tooltipCount = 0;
std::string time_format = "";
switch (state) {
case UP_DEVICE_STATE_CHARGING:
case UP_DEVICE_STATE_PENDING_CHARGE:
time_format = timeToString(time_full);
break;
case UP_DEVICE_STATE_DISCHARGING:
case UP_DEVICE_STATE_PENDING_DISCHARGE:
time_format = timeToString(time_empty);
break;
default:
break;
}
// CSS status class // CSS status class
const std::string status = getDeviceStatus(state); const std::string status = getDeviceStatus(state);
// Remove last status if it exists // Remove last status if it exists
@ -309,19 +291,22 @@ auto UPower::update() -> void {
if (devices.size() == 0 && !displayDeviceValid && hideIfEmpty) { if (devices.size() == 0 && !displayDeviceValid && hideIfEmpty) {
event_box_.set_visible(false); event_box_.set_visible(false);
goto update; // Call parent update
AModule::update();
return;
} }
event_box_.set_visible(true); event_box_.set_visible(true);
// Tooltip // Tooltip
if (tooltip_enabled) { if (tooltip_enabled) {
tooltipCount = upower_tooltip->updateTooltip(devices); uint tooltipCount = upower_tooltip->updateTooltip(devices);
// Disable the tooltip if there aren't any devices in the tooltip // Disable the tooltip if there aren't any devices in the tooltip
box_.set_has_tooltip(!devices.empty() && tooltipCount > 0); box_.set_has_tooltip(!devices.empty() && tooltipCount > 0);
} }
// Set percentage // Set percentage
std::string percentString = "";
if (displayDeviceValid) { if (displayDeviceValid) {
percentString = std::to_string(int(percentage + 0.5)) + "%"; percentString = std::to_string(int(percentage + 0.5)) + "%";
} }
@ -337,7 +322,6 @@ auto UPower::update() -> void {
} }
icon_.set_from_icon_name(icon_name, Gtk::ICON_SIZE_INVALID); icon_.set_from_icon_name(icon_name, Gtk::ICON_SIZE_INVALID);
update:
// Call parent update // Call parent update
AModule::update(); AModule::update();
} }