Merge pull request #2280 from zjeffer/fix/hyprland/workspaces

src/modules/gamemode.cpp

@@ -18,7 +18,6 @@
 #include "glibmm/varianttype.h"
 #include "gtkmm/label.h"
 #include "gtkmm/tooltip.h"
-
 #include "util/gtk_icon.hpp"
 
 namespace waybar::modules {

src/modules/hyprland/workspaces.cpp

@@ -104,7 +104,7 @@ void Workspaces::remove_workspace(int id) {
                                 [&](std::unique_ptr<Workspace> &x) { return x->id() == id; });
 
   if (workspace == workspaces_.end()) {
-    spdlog::warn("Can't find workspace with id {}", workspace->get()->id());
+    spdlog::warn("Can't find workspace with id {}", id);
     return;
   }
 

src/modules/sway/window.cpp

@@ -11,8 +11,8 @@
 #include <regex>
 #include <string>
 
-#include "util/rewrite_string.hpp"
 #include "util/gtk_icon.hpp"
+#include "util/rewrite_string.hpp"
 
 namespace waybar::modules::sway {
 

src/modules/upower/upower.cpp

@@ -6,7 +6,6 @@
 #include <string>
 
 #include "gtkmm/tooltip.h"
-
 #include "util/gtk_icon.hpp"
 
 namespace waybar::modules::upower {

src/modules/upower/upower_tooltip.cpp

@@ -4,7 +4,6 @@
 #include "gtkmm/enums.h"
 #include "gtkmm/image.h"
 #include "gtkmm/label.h"
-
 #include "util/gtk_icon.hpp"
 
 namespace waybar::modules::upower {

src/util/gtk_icon.cpp

@@ -5,19 +5,18 @@
  * access can cause data corruption and lead to invalid memory access and crashes.
  * Even concurrent calls that seem read only such as has_icon can cause issues because
  * the GTK lib may update the internal icon cache on this calls.
-*/
+ */
 
 std::mutex DefaultGtkIconThemeWrapper::default_theme_mutex;
 
 bool DefaultGtkIconThemeWrapper::has_icon(const std::string& value) {
-
   const std::lock_guard<std::mutex> lock(default_theme_mutex);
 
   return Gtk::IconTheme::get_default()->has_icon(value);
 }
 
-Glib::RefPtr<Gdk::Pixbuf> DefaultGtkIconThemeWrapper::load_icon(const char *name, int tmp_size, Gtk::IconLookupFlags flags) {
-
+Glib::RefPtr<Gdk::Pixbuf> DefaultGtkIconThemeWrapper::load_icon(const char* name, int tmp_size,
+                                                                Gtk::IconLookupFlags flags) {
   const std::lock_guard<std::mutex> lock(default_theme_mutex);
 
   auto default_theme = Gtk::IconTheme::get_default();