tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2025-07-18 00:42:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added custom tooltip with device icon, device name and battery status

Browse Source
This commit is contained in:
Erik Reider
2022-03-19 17:09:55 +01:00
parent 4196e0d5d1
commit 7fac2afb85
6 changed files with 229 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,11 @@
#include "modules/upower/upower.hpp"
#include "gtkmm/icontheme.h"
#include "gtkmm/label.h"
#include "gtkmm/tooltip.h"
#include "modules/upower/upower_tooltip.hpp"
namespace waybar::modules {
namespace waybar::modules::upower {
UPower::UPower(const std::string& id, const Json::Value& config)
: AModule(config, "upower", id),
box_(Gtk::ORIENTATION_HORIZONTAL, 0),
@@ -26,6 +29,23 @@ UPower::UPower(const std::string& id, const Json::Value& config)
hideIfEmpty = config_["hide-if-empty"].asBool();
}
// Tooltip Spacing
if (config_["tooltip-spacing"].isUInt()) {
tooltip_spacing = config_["tooltip-spacing"].asUInt();
}
// Tooltip
if (config_["tooltip"].isBool()) {
tooltip_enabled = config_["tooltip"].asBool();
}
box_.set_has_tooltip(tooltip_enabled);
if (tooltip_enabled) {
// Sets the window to use when showing the tooltip
upower_tooltip = new UPowerTooltip(iconSize, tooltip_spacing);
box_.set_tooltip_window(*upower_tooltip);
box_.signal_query_tooltip().connect(sigc::mem_fun(*this, &UPower::show_tooltip_callback));
}
GError* error = NULL;
client = up_client_new_full(NULL, &error);
if (client == NULL) {
@@ -174,6 +194,10 @@ void UPower::resetDevices() {
dp.emit();
}
bool UPower::show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
return true;
}
auto UPower::update() -> void {
std::lock_guard<std::mutex> guard(m_Mutex);
@@ -204,7 +228,7 @@ auto UPower::update() -> void {
std::string percentString = "";
std::string tooltip = "";
uint tooltipCount = 0;
if (devices.size() == 0 && !displayDeviceValid && hideIfEmpty) {
event_box_.set_visible(false);
@@ -213,18 +237,12 @@ auto UPower::update() -> void {
event_box_.set_visible(true);
// TODO: Tooltip
if (!devices.empty()) {
for (auto& e : devices) {
const gchar* objectPath = up_device_get_object_path(e.second);
double percentage;
g_object_get(e.second, "percentage", &percentage, NULL);
printf("Device: %s, VALID: %f\n", objectPath, percentage);
}
} else {
printf("No devices\n");
// Tooltip
if (tooltip_enabled) {
tooltipCount = upower_tooltip->updateTooltip(devices);
// Disable the tooltip if there aren't any devices in the tooltip
box_.set_has_tooltip(!devices.empty() && tooltipCount > 0);
}
// box_.set_tooltip
// Set percentage
if (displayDeviceValid) {
@@ -243,4 +261,4 @@ update:
AModule::update();
}
} // namespace waybar::modules
} // namespace waybar::modules::upower