fix title not showing for special workspaces (seperate outputs: false

Alexays · Feb 24, 2024 · 9f5c27c · 9f5c27c
1 parent 0cbb280
commit 9f5c27c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/include/modules/hyprland/window.hpp b/include/modules/hyprland/window.hpp
@@ -42,7 +42,6 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
   };
 
   auto getActiveWorkspace(const std::string&) -> Workspace;
-  auto getActiveWorkspace() -> Workspace;
   void onEvent(const std::string&) override;
   void queryActiveWorkspace();
   void setClass(const std::string&, bool enable);

diff --git a/src/modules/hyprland/window.cpp b/src/modules/hyprland/window.cpp
@@ -84,17 +84,12 @@ auto Window::update() -> void {
   AAppIconLabel::update();
 }
 
-auto Window::getActiveWorkspace() -> Workspace {
-  const auto workspace = gIPC->getSocket1JsonReply("activeworkspace");
-  assert(workspace.isObject());
-  return Workspace::parse(workspace);
-}
-
-auto Window::getActiveWorkspace(const std::string& monitorName) -> Workspace {
+auto Window::getActiveWorkspace(const std::string& monitorName = "") -> Workspace {
   const auto monitors = gIPC->getSocket1JsonReply("monitors");
   assert(monitors.isArray());
-  auto monitor = std::find_if(monitors.begin(), monitors.end(),
-                              [&](Json::Value monitor) { return monitor["name"] == monitorName; });
+  auto monitor = std::find_if(monitors.begin(), monitors.end(), [&](Json::Value monitor) {
+    return monitorName == "" ? monitor["focused"].asBool() : monitor["name"] == monitorName;
+  });
   if (monitor == std::end(monitors)) {
     spdlog::warn("Monitor not found: {}", monitorName);
     return Workspace{-1, 0, "", ""};