blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(network): Use Signal Strength for format-icons

This commit is contained in:
Robinhuett 2018-12-25 14:17:34 +01:00
parent 7404f80122
commit ad638357b5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/network.cpp
View File

@ -105,17 +105,21 @@ void waybar::modules::Network::worker()
auto waybar::modules::Network::update() -> void auto waybar::modules::Network::update() -> void
{ {
auto format = format_; auto format = format_;
std::string connectiontype;
if (ifid_ <= 0 || ipaddr_.empty()) { if (ifid_ <= 0 || ipaddr_.empty()) {
format = config_["format-disconnected"].isString() format = config_["format-disconnected"].isString()
? config_["format-disconnected"].asString() : format; ? config_["format-disconnected"].asString() : format;
label_.get_style_context()->add_class("disconnected"); label_.get_style_context()->add_class("disconnected");
connectiontype = "disconnected";
} else { } else {
if (essid_.empty()) { if (essid_.empty()) {
format = config_["format-ethernet"].isString() format = config_["format-ethernet"].isString()
? config_["format-ethernet"].asString() : format; ? config_["format-ethernet"].asString() : format;
connectiontype = "ethernet";
} else { } else {
format = config_["format-wifi"].isString() format = config_["format-wifi"].isString()
? config_["format-wifi"].asString() : format; ? config_["format-wifi"].asString() : format;
connectiontype = "wifi";
} }
label_.get_style_context()->remove_class("disconnected"); label_.get_style_context()->remove_class("disconnected");
} }
@ -126,7 +130,8 @@ auto waybar::modules::Network::update() -> void
fmt::arg("ifname", ifname_), fmt::arg("ifname", ifname_),
fmt::arg("netmask", netmask_), fmt::arg("netmask", netmask_),
fmt::arg("ipaddr", ipaddr_), fmt::arg("ipaddr", ipaddr_),
fmt::arg("cidr", cidr_) fmt::arg("cidr", cidr_),
fmt::arg("icon", getIcon(signal_strength_, connectiontype))
)); ));
} }