Merge remote-tracking branch 'upstream/master'

2026-03-10 14:27:40 +01:00
parent 736c053350 100349a5c7
commit f5d2ef1c4c
95 changed files with 1404 additions and 556 deletions
@@ -4,6 +4,7 @@
 #include <gtkmm/enums.h>
 #include <gtkmm/label.h>
 #include <json/value.h>
+#include <sigc++/connection.h>

 #include <cstdint>
 #include <map>
@@ -59,7 +60,7 @@ class Workspaces : public AModule, public EventHandler {
  enum class ActiveWindowPosition { NONE, FIRST, LAST };
  auto activeWindowPosition() const -> ActiveWindowPosition { return m_activeWindowPosition; }

-  std::string getRewrite(std::string window_class, std::string window_title);
+  std::string getRewrite(const std::string& window_class, const std::string& window_title);
  std::string& getWindowSeparator() { return m_formatWindowSeparator; }
  auto windowRewriteGroupThreshold() const -> int { return m_windowRewriteGroupThreshold; }
  auto const& getWindowRewriteGroupFormat() const { return m_windowRewriteGroupFormat; }
@@ -212,6 +213,7 @@ class Workspaces : public AModule, public EventHandler {
  std::mutex m_mutex;
  const Bar& m_bar;
  Gtk::Box m_box;
+  sigc::connection m_scrollEventConnection_;
  IPC& m_ipc;
 };