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

refactor(Tray): also search in default theme

pull/265/head
Alex 2019-04-11 15:28:38 +02:00
parent 78067462be
commit 57c99dc526
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/sni/item.hpp
View File

@ -65,6 +65,7 @@ private:
Glib::RefPtr<Gio::Cancellable> cancellable_; Glib::RefPtr<Gio::Cancellable> cancellable_;
Glib::RefPtr<Gio::DBus::Proxy> proxy_; Glib::RefPtr<Gio::DBus::Proxy> proxy_;
std::vector<Glib::ustring> default_icon_path_;
bool update_pending_; bool update_pending_;
}; };

5
src/modules/sni/item.cpp
View File

@ -14,6 +14,7 @@ waybar::modules::SNI::Item::Item(std::string bn, std::string op, const Json::Val
if (config["icon-size"].isUInt()) { if (config["icon-size"].isUInt()) {
icon_size = config["icon-size"].asUInt(); icon_size = config["icon-size"].asUInt();
} }
default_icon_path_ = Gtk::IconTheme::get_default()->get_search_path();
event_box.add(image); event_box.add(image);
event_box.add_events(Gdk::BUTTON_PRESS_MASK); event_box.add_events(Gdk::BUTTON_PRESS_MASK);
event_box.signal_button_press_event().connect( event_box.signal_button_press_event().connect(
@ -94,7 +95,9 @@ waybar::modules::SNI::Item::setProperty(const ustring& name,
} else if (name == "IconThemePath") { } else if (name == "IconThemePath") {
icon_theme_path = get_variant<std::string>(value); icon_theme_path = get_variant<std::string>(value);
if (!icon_theme_path.empty()) { if (!icon_theme_path.empty()) {
icon_theme->set_search_path({icon_theme_path}); std::vector<Glib::ustring> paths(default_icon_path_);
paths.push_back(icon_theme_path);
icon_theme->set_search_path(paths);
} }
} else if (name == "Menu") { } else if (name == "Menu") {
menu = get_variant<std::string>(value); menu = get_variant<std::string>(value);