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

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

This commit is contained in:
Alexis Rouillard 2023-07-04 19:58:07 +02:00 committed by GitHub
parent 5f29e5a5e8 7ef80d563b
commit 18f5af835f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/gamemode.cpp
View File

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

2
src/modules/hyprland/workspaces.cpp
View File

@ -104,7 +104,7 @@ void Workspaces::remove_workspace(int id) {
[&](std::unique_ptr<Workspace> &x) { return x->id() == id; }); [&](std::unique_ptr<Workspace> &x) { return x->id() == id; });
if (workspace == workspaces_.end()) { 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; return;
} }

2
src/modules/sway/window.cpp
View File

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

1
src/modules/upower/upower.cpp
View File

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

1
src/modules/upower/upower_tooltip.cpp
View File

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

7
src/util/gtk_icon.cpp
View File

@ -5,19 +5,18 @@
* access can cause data corruption and lead to invalid memory access and crashes. * 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 * 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. * the GTK lib may update the internal icon cache on this calls.
*/ */
std::mutex DefaultGtkIconThemeWrapper::default_theme_mutex; std::mutex DefaultGtkIconThemeWrapper::default_theme_mutex;
bool DefaultGtkIconThemeWrapper::has_icon(const std::string& value) { bool DefaultGtkIconThemeWrapper::has_icon(const std::string& value) {
const std::lock_guard<std::mutex> lock(default_theme_mutex); const std::lock_guard<std::mutex> lock(default_theme_mutex);
return Gtk::IconTheme::get_default()->has_icon(value); 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); const std::lock_guard<std::mutex> lock(default_theme_mutex);
auto default_theme = Gtk::IconTheme::get_default(); auto default_theme = Gtk::IconTheme::get_default();