Merge branch 'master' into feature/module-brightness
This commit is contained in:
commit
afbf2de1b9
|
@ -6,7 +6,7 @@ services:
|
|||
env:
|
||||
- distro: debian
|
||||
- distro: archlinux
|
||||
- distro: opensuse
|
||||
# - distro: opensuse
|
||||
|
||||
before_install:
|
||||
- docker pull alexays/waybar:${distro}
|
||||
|
|
|
@ -12,6 +12,7 @@ window#waybar {
|
|||
color: white;
|
||||
}
|
||||
|
||||
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background: transparent;
|
||||
|
|
|
@ -202,14 +202,16 @@ auto waybar::modules::Pulseaudio::update() -> void
|
|||
format =
|
||||
config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
|
||||
label_.get_style_context()->add_class("muted");
|
||||
} else if (port_name_.find("a2dp_sink") != std::string::npos) {
|
||||
} else {
|
||||
label_.get_style_context()->remove_class("muted");
|
||||
if (port_name_.find("a2dp_sink") != std::string::npos) {
|
||||
format = config_["format-bluetooth"].isString()
|
||||
? config_["format-bluetooth"].asString() : format;
|
||||
label_.get_style_context()->add_class("bluetooth");
|
||||
} else {
|
||||
label_.get_style_context()->remove_class("muted");
|
||||
label_.get_style_context()->remove_class("bluetooth");
|
||||
}
|
||||
}
|
||||
label_.set_markup(
|
||||
fmt::format(format, fmt::arg("volume", volume_),
|
||||
fmt::arg("icon", getIcon(volume_, getPortIcon()))));
|
||||
|
|
Loading…
Reference in New Issue