p90463782
/
ukui-search
forked from openkylin/ukui-search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Wrong display of some files' icons.

This commit is contained in:
iaom 2021-09-13 21:05:49 +08:00
parent 617e73f577
commit c94f70e042
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsearch/file-utils.cpp
View File

@ -55,31 +55,24 @@ QIcon FileUtils::getFileIcon(const QString &uri, bool checkValid) {
if(!G_IS_FILE_INFO(info.get()->get())) if(!G_IS_FILE_INFO(info.get()->get()))
return QIcon::fromTheme("unknown"); return QIcon::fromTheme("unknown");
GIcon *g_icon = g_file_info_get_icon(info.get()->get()); GIcon *g_icon = g_file_info_get_icon(info.get()->get());
QString icon_name;
//do not unref the GIcon from info. //do not unref the GIcon from info.
if(G_IS_ICON(g_icon)) { if(G_IS_ICON(g_icon)) {
const gchar* const* icon_names = g_themed_icon_get_names(G_THEMED_ICON(g_icon)); const gchar* const* icon_names = g_themed_icon_get_names(G_THEMED_ICON(g_icon));
if(icon_names) { if(icon_names) {
auto p = icon_names; auto p = icon_names;
if(*p)
icon_name = QString(*p);
if(checkValid) {
while(*p) { while(*p) {
QIcon icon = QIcon::fromTheme(*p); QIcon icon = QIcon::fromTheme(*p);
if(!icon.isNull()) { if(!icon.isNull()) {
icon_name = QString(*p); return icon;
break;
} else { } else {
p++; p++;
} }
} }
} }
} }
}
if(!QIcon::hasThemeIcon(icon_name)) {
return QIcon::fromTheme("unknown"); return QIcon::fromTheme("unknown");
}
return QIcon::fromTheme(icon_name);
} }
/** /**