Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sni icon search path not recursive

Browse Source 
https://github.com/linuxdeepin/internal-discussion/issues/710

Change-Id: I2411be6d3d8b9aaaf0254cbdb7f9d53cea95aff7
This commit is contained in:
listenerri 2019-01-03 09:57:33 +08:00
parent 395de03ee6
commit c002c83984
Notes: gerrit 2019-01-03 14:45:25 +08:00 
Verified+1: <jenkins@deepin.com>
Verified+1: liuwen123 <liuwen@linuxdeepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Thu, 03 Jan 2019 14:45:24 +0800
Reviewed-on: https://cr.deepin.io/41046
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/tray/snitraywidget.cpp
View File

@ -315,10 +315,11 @@ QPixmap SNITrayWidget::newIconPixmap(IconType iconType)
// load icon from specified file
if (!iconThemePath.isEmpty() && !iconName.isEmpty()) {
QFileInfoList fileInfoList = QDir(iconThemePath).entryInfoList(QDir::Filter::Files);
for (auto fileInfo : fileInfoList) {
if (fileInfo.fileName().startsWith(iconName, Qt::CaseInsensitive)) {
QImage image(fileInfo.absoluteFilePath());
QDirIterator it(iconThemePath, QDirIterator::Subdirectories);
while (it.hasNext()) {
it.next();
if (it.fileName().startsWith(iconName, Qt::CaseInsensitive)) {
QImage image(it.filePath());
pixmap = QPixmap::fromImage(image.scaled(iconSizeScaled, iconSizeScaled, Qt::KeepAspectRatio, Qt::SmoothTransformation));
pixmap.setDevicePixelRatio(ratio);
if (!pixmap.isNull()) {