tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change find icon priority and to_lower app_id

Browse Source
This commit is contained in:
dmitry 2020-07-01 02:10:22 +03:00
parent d35e92569d
commit 8e6cbc1021
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/wlr/taskbar.cpp
View File

@ -85,9 +85,9 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr<Gtk::IconTheme> icon
* send a single app-id, but in any case this works fine */ * send a single app-id, but in any case this works fine */
while (stream >> app_id) while (stream >> app_id)
{ {
std::string icon_name = get_from_desktop_app_info(app_id); std::string icon_name = get_from_icon_theme(icon_theme, app_id);
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_icon_theme(icon_theme, app_id); icon_name = get_from_desktop_app_info(app_id);
if (icon_name.empty()) if (icon_name.empty())
continue; continue;
@ -271,7 +271,9 @@ void Task::handle_title(const char *title)
void Task::handle_app_id(const char *app_id) void Task::handle_app_id(const char *app_id)
{ {
app_id_ = app_id; app_id_ = app_id;
if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, std::transform(app_id_.begin(), app_id_.end(), app_id_.begin(),
[](char c){ return std::tolower(c); });
if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_,
config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16)) config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16))
spdlog::warn("Failed to load icon for {}", app_id); spdlog::warn("Failed to load icon for {}", app_id);