Merge branch 'Alexays:master' into master
This commit is contained in:
commit
90b5b21394
|
@ -66,7 +66,7 @@ class UPower : public AModule {
|
||||||
Devices devices;
|
Devices devices;
|
||||||
std::mutex m_Mutex;
|
std::mutex m_Mutex;
|
||||||
UpClient *client;
|
UpClient *client;
|
||||||
UpDevice *displayDevice;
|
UpDevice *displayDevice = nullptr;
|
||||||
guint login1_id;
|
guint login1_id;
|
||||||
GDBusConnection *login1_connection;
|
GDBusConnection *login1_connection;
|
||||||
std::unique_ptr<UPowerTooltip> upower_tooltip;
|
std::unique_ptr<UPowerTooltip> upower_tooltip;
|
||||||
|
|
|
@ -87,3 +87,4 @@ $path\\n$tooltip
|
||||||
# STYLE
|
# STYLE
|
||||||
|
|
||||||
- *#image*
|
- *#image*
|
||||||
|
- *#image.empty*
|
||||||
|
|
|
@ -63,9 +63,11 @@ auto waybar::modules::Image::update() -> void {
|
||||||
}
|
}
|
||||||
image_.set(pixbuf);
|
image_.set(pixbuf);
|
||||||
image_.show();
|
image_.show();
|
||||||
|
image_.get_style_context()->remove_class("empty");
|
||||||
} else {
|
} else {
|
||||||
image_.clear();
|
image_.clear();
|
||||||
image_.hide();
|
image_.hide();
|
||||||
|
image_.get_style_context()->add_class("empty");
|
||||||
}
|
}
|
||||||
|
|
||||||
AModule::update();
|
AModule::update();
|
||||||
|
|
|
@ -527,11 +527,11 @@ void Task::handle_closed() {
|
||||||
spdlog::debug("{} closed", repr());
|
spdlog::debug("{} closed", repr());
|
||||||
zwlr_foreign_toplevel_handle_v1_destroy(handle_);
|
zwlr_foreign_toplevel_handle_v1_destroy(handle_);
|
||||||
handle_ = nullptr;
|
handle_ = nullptr;
|
||||||
tbar_->remove_task(id_);
|
|
||||||
if (button_visible_) {
|
if (button_visible_) {
|
||||||
tbar_->remove_button(button);
|
tbar_->remove_button(button);
|
||||||
button_visible_ = false;
|
button_visible_ = false;
|
||||||
}
|
}
|
||||||
|
tbar_->remove_task(id_);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Task::handle_clicked(GdkEventButton *bt) {
|
bool Task::handle_clicked(GdkEventButton *bt) {
|
||||||
|
|
Loading…
Reference in New Issue