Merge pull request #2703 from czadowanie/master

upower: show-icon config option
Alexays · Dec 5, 2023 · 5f8ae44 · 5f8ae44
2 parents 4846ff7 + 4283195
commit 5f8ae44
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
@@ -72,6 +72,7 @@ class UPower : public AModule {
   std::unique_ptr<UPowerTooltip> upower_tooltip;
   std::string lastStatus;
   bool showAltText;
+  bool showIcon = true;
   bool upowerRunning;
   guint upowerWatcher_id;
   std::string nativePath_;

diff --git a/man/waybar-upower.5.scd b/man/waybar-upower.5.scd
@@ -57,6 +57,11 @@ compatible devices in the tooltip.
 	typeof: string ++
 	Command to execute when clicked on the module.
 
+*show-icon*: ++
+	typeof: bool ++
+	default: true ++
+	Option to disable battery icon.
+
 # FORMAT REPLACEMENTS
 
 *{percentage}*: The battery capacity in percentage
@@ -93,6 +98,15 @@ depending on the charging state.
 	"tooltip": true,
 	"tooltip-spacing": 20
 }
+```
+```
+"upower": {
+	"show-icon": false,
+	"hide-if-empty": true,
+	"tooltip": true,
+	"tooltip-spacing": 20
+}
+
 ```
 
 # STYLE

diff --git a/src/modules/upower/upower.cpp b/src/modules/upower/upower.cpp
@@ -18,7 +18,15 @@ UPower::UPower(const std::string& id, const Json::Value& config)
       m_Mutex(),
       client(),
       showAltText(false) {
-  box_.pack_start(icon_);
+  // Show icon only when "show-icon" isn't set to false
+  if (config_["show-icon"].isBool()) {
+    showIcon = config_["show-icon"].asBool();
+  }
+
+  if (showIcon) {
+    box_.pack_start(icon_);
+  }
+
   box_.pack_start(label_);
   box_.set_name(name_);
   event_box_.add(box_);