Formatting fixes
This commit is contained in:
parent
d3be9a7363
commit
7ef80d563b
|
@ -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 {
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue