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

Refactor the lower_app_id logic 

Move the lower_app_id lookup logic completely in the image_load_icon
method and use it also when looking up the icon from the desktop files
as well as icon themes.
pull/766/head
Till Smejkal 2020-07-07 10:39:28 +02:00
parent 7d9f6096fe
commit 70e368a1c6
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,16 +82,6 @@ static std::string get_from_desktop_app_info(const std::string &app_id)
"applications/org.kde." "applications/org.kde."
}; };
std::string lower_app_id = app_id;
std::transform(std::begin(lower_app_id), std::end(lower_app_id), std::begin(lower_app_id),
[](unsigned char c) { return std::tolower(c); });
std::vector<std::string> app_id_variations = {
app_id,
lower_app_id
};
std::vector<std::string> suffixes = { std::vector<std::string> suffixes = {
"", "",
".desktop" ".desktop"
@ -101,10 +91,9 @@ static std::string get_from_desktop_app_info(const std::string &app_id)
for (auto& prefix : prefixes) for (auto& prefix : prefixes)
for (auto& folder : app_folders) for (auto& folder : app_folders)
for (auto& id : app_id_variations) for (auto& suffix : suffixes)
for (auto& suffix : suffixes) if (!app_info)
if (!app_info) app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + app_id + suffix);
app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + id + suffix);
if (app_info) if (app_info)
return app_info->get_icon()->to_string(); return app_info->get_icon()->to_string();
@ -126,26 +115,23 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr<Gtk::IconTheme> icon
const std::string &app_id_list, int size) const std::string &app_id_list, int size)
{ {
std::string app_id; std::string app_id;
std::string lower_app_id;
std::istringstream stream(app_id_list); std::istringstream stream(app_id_list);
bool found = false; bool found = false;
/* Wayfire sends a list of app-id's in space separated format, other compositors /* Wayfire sends a list of app-id's in space separated format, other compositors
* 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)
{ {
auto lower_app_id = app_id;
std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(),
[](char c){ return std::tolower(c); });
std::string icon_name = get_from_icon_theme(icon_theme, app_id); std::string icon_name = get_from_icon_theme(icon_theme, app_id);
if (icon_name.empty()) {
lower_app_id = app_id;
std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(),
[](char c){ return std::tolower(c); });
icon_name = get_from_icon_theme(icon_theme, lower_app_id);
}
if (icon_name.empty())
icon_name = get_from_icon_theme(icon_theme, lower_app_id);
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_desktop_app_info(app_id); icon_name = get_from_desktop_app_info(app_id);
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_desktop_app_info(lower_app_id); icon_name = get_from_desktop_app_info(lower_app_id);