Merge pull request #1865 from Dordovel/master

Fix https://github.com/Alexays/Waybar/pull/1854#issue-1469577538
This commit is contained in:
Alex 2022-12-05 09:01:45 +01:00 committed by GitHub
commit 53e89dace7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,6 +27,7 @@ const static int LEFT_MOUSE_BUTTON_CODE = 1;
namespace waybar::modules { namespace waybar::modules {
User::User(const std::string& id, const Json::Value& config) User::User(const std::string& id, const Json::Value& config)
: AIconLabel(config, "user", id, "{user} {work_H}:{work_M}", 60, false, true, true) { : AIconLabel(config, "user", id, "{user} {work_H}:{work_M}", 60, false, true, true) {
AIconLabel::box_.set_spacing(0);
if (AIconLabel::iconEnabled()) { if (AIconLabel::iconEnabled()) {
this->init_avatar(AIconLabel::config_); this->init_avatar(AIconLabel::config_);
} }
@ -137,6 +138,6 @@ auto User::update() -> void {
fmt::arg("work_S", fmt::format("{:%S}", workSystemTimeSeconds)), fmt::arg("work_S", fmt::format("{:%S}", workSystemTimeSeconds)),
fmt::arg("user", systemUser)); fmt::arg("user", systemUser));
ALabel::label_.set_markup(label); ALabel::label_.set_markup(label);
ALabel::update(); AIconLabel::update();
} }
}; // namespace waybar::modules }; // namespace waybar::modules