From 982ffde0027d3808858248929bc6317c766f5f44 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Fri, 14 Apr 2023 01:25:13 +0200 Subject: [PATCH] Use labels instead of buttons --- include/modules/cpu_frequency.hpp | 4 ++-- include/modules/cpu_usage.hpp | 4 ++-- include/modules/load.hpp | 4 ++-- src/modules/cpu_frequency/common.cpp | 8 ++++---- src/modules/cpu_usage/common.cpp | 8 ++++---- src/modules/load.cpp | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/modules/cpu_frequency.hpp b/include/modules/cpu_frequency.hpp index 84475722..0b5bba0c 100644 --- a/include/modules/cpu_frequency.hpp +++ b/include/modules/cpu_frequency.hpp @@ -9,12 +9,12 @@ #include #include -#include "AButton.hpp" +#include "ALabel.hpp" #include "util/sleeper_thread.hpp" namespace waybar::modules { -class CpuFrequency : public AButton { +class CpuFrequency : public ALabel { public: CpuFrequency(const std::string&, const Json::Value&); ~CpuFrequency() = default; diff --git a/include/modules/cpu_usage.hpp b/include/modules/cpu_usage.hpp index 0e57124a..3088c5a6 100644 --- a/include/modules/cpu_usage.hpp +++ b/include/modules/cpu_usage.hpp @@ -9,12 +9,12 @@ #include #include -#include "AButton.hpp" +#include "ALabel.hpp" #include "util/sleeper_thread.hpp" namespace waybar::modules { -class CpuUsage : public AButton { +class CpuUsage : public ALabel { public: CpuUsage(const std::string&, const Json::Value&); ~CpuUsage() = default; diff --git a/include/modules/load.hpp b/include/modules/load.hpp index 39df4131..1d11370d 100644 --- a/include/modules/load.hpp +++ b/include/modules/load.hpp @@ -9,12 +9,12 @@ #include #include -#include "AButton.hpp" +#include "ALabel.hpp" #include "util/sleeper_thread.hpp" namespace waybar::modules { -class Load : public AButton { +class Load : public ALabel { public: Load(const std::string&, const Json::Value&); ~Load() = default; diff --git a/src/modules/cpu_frequency/common.cpp b/src/modules/cpu_frequency/common.cpp index 13aa4d27..abed2aba 100644 --- a/src/modules/cpu_frequency/common.cpp +++ b/src/modules/cpu_frequency/common.cpp @@ -10,7 +10,7 @@ #endif waybar::modules::CpuFrequency::CpuFrequency(const std::string& id, const Json::Value& config) - : AButton(config, "cpu_frequency", id, "{avg_frequency}", 10) { + : ALabel(config, "cpu_frequency", id, "{avg_frequency}", 10) { thread_ = [this] { dp.emit(); thread_.sleep_for(interval_); @@ -24,7 +24,7 @@ auto waybar::modules::CpuFrequency::update() -> void { auto tooltip = fmt::format("Minimum frequency: {}\nAverage frequency: {}\nMaximum frequency: {}\n", min_frequency, avg_frequency, max_frequency); - button_.set_tooltip_text(tooltip); + label_.set_tooltip_text(tooltip); } auto format = format_; auto state = getState(avg_frequency); @@ -42,11 +42,11 @@ auto waybar::modules::CpuFrequency::update() -> void { store.push_back(fmt::arg("max_frequency", max_frequency)); store.push_back(fmt::arg("min_frequency", min_frequency)); store.push_back(fmt::arg("avg_frequency", avg_frequency)); - label_->set_markup(fmt::vformat(format, store)); + label_.set_markup(fmt::vformat(format, store)); } // Call parent update - AButton::update(); + ALabel::update(); } std::tuple waybar::modules::CpuFrequency::getCpuFrequency() { diff --git a/src/modules/cpu_usage/common.cpp b/src/modules/cpu_usage/common.cpp index 140373a0..bd56cf1a 100644 --- a/src/modules/cpu_usage/common.cpp +++ b/src/modules/cpu_usage/common.cpp @@ -10,7 +10,7 @@ #endif waybar::modules::CpuUsage::CpuUsage(const std::string& id, const Json::Value& config) - : AButton(config, "cpu_usage", id, "{usage}%", 10) { + : ALabel(config, "cpu_usage", id, "{usage}%", 10) { thread_ = [this] { dp.emit(); thread_.sleep_for(interval_); @@ -21,7 +21,7 @@ auto waybar::modules::CpuUsage::update() -> void { // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both auto [cpu_usage, tooltip] = getCpuUsage(); if (tooltipEnabled()) { - button_.set_tooltip_text(tooltip); + label_.set_tooltip_text(tooltip); } auto format = format_; auto total_usage = cpu_usage.empty() ? 0 : cpu_usage[0]; @@ -45,11 +45,11 @@ auto waybar::modules::CpuUsage::update() -> void { auto icon_format = fmt::format("icon{}", core_i); store.push_back(fmt::arg(icon_format.c_str(), getIcon(cpu_usage[i], icons))); } - label_->set_markup(fmt::vformat(format, store)); + label_.set_markup(fmt::vformat(format, store)); } // Call parent update - AButton::update(); + ALabel::update(); } std::tuple, std::string> waybar::modules::CpuUsage::getCpuUsage() { diff --git a/src/modules/load.cpp b/src/modules/load.cpp index 98bc1302..2ea646f3 100644 --- a/src/modules/load.cpp +++ b/src/modules/load.cpp @@ -10,7 +10,7 @@ #endif waybar::modules::Load::Load(const std::string& id, const Json::Value& config) - : AButton(config, "load", id, "{load1}", 10) { + : ALabel(config, "load", id, "{load1}", 10) { thread_ = [this] { dp.emit(); thread_.sleep_for(interval_); @@ -22,7 +22,7 @@ auto waybar::modules::Load::update() -> void { auto [load1, load5, load15] = getLoad(); if (tooltipEnabled()) { auto tooltip = fmt::format("Load 1: {}\nLoad 5: {}\nLoad 15: {}", load1, load5, load15); - button_.set_tooltip_text(tooltip); + label_.set_tooltip_text(tooltip); } auto format = format_; auto state = getState(load1); @@ -42,11 +42,11 @@ auto waybar::modules::Load::update() -> void { store.push_back(fmt::arg("icon1", getIcon(load1, icons))); store.push_back(fmt::arg("icon5", getIcon(load5, icons))); store.push_back(fmt::arg("icon15", getIcon(load15, icons))); - label_->set_markup(fmt::vformat(format, store)); + label_.set_markup(fmt::vformat(format, store)); } // Call parent update - AButton::update(); + ALabel::update(); } std::tuple waybar::modules::Load::getLoad() { @@ -57,5 +57,5 @@ std::tuple waybar::modules::Load::getLoad() { double load15 = std::ceil(load[2] * 100.0) / 100.0; return {load1, load5, load15}; } - throw std::runtime_error("Can't get Cpu load"); + throw std::runtime_error("Can't get Load"); }