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

fix: unable get docked entriy by soft link path

Browse Source 
set canonicalFilePath instead of absoluteFilePath for deskfileinfo
and find it by canonicalFilePath instead of user input path

log: use canonicalFilePath instead of absoluteFilePath
This commit is contained in:
tsic404 2024-01-23 17:14:23 +08:00 committed by deepin-bot[bot]
parent 0300e28332
commit 3939ca9c12
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/taskmanager/desktopinfo.cpp
View File

@ -40,7 +40,7 @@ DesktopInfo::DesktopInfo(const QString &desktopfile)
} }
} }
m_desktopFilePath = desktopFileInfo.absoluteFilePath(); m_desktopFilePath = desktopFileInfo.canonicalFilePath();
m_isValid = desktopFileInfo.isAbsolute() && QFile::exists(desktopFileInfo.absoluteFilePath()); m_isValid = desktopFileInfo.isAbsolute() && QFile::exists(desktopFileInfo.absoluteFilePath());
m_desktopFile.reset(new QSettings(m_desktopFilePath, QSettings::IniFormat)); m_desktopFile.reset(new QSettings(m_desktopFilePath, QSettings::IniFormat));
m_desktopFile->setIniCodec("utf-8"); m_desktopFile->setIniCodec("utf-8");

4
frame/taskmanager/entries.cpp
View File

@ -162,9 +162,11 @@ QList<Entry*> Entries::getEntries()
Entry *Entries::getDockedEntryByDesktopFile(const QString &desktopFile) Entry *Entries::getDockedEntryByDesktopFile(const QString &desktopFile)
{ {
QFileInfo desktopFileInfo(desktopFile);
Entry *ret = nullptr; Entry *ret = nullptr;
for (auto entry : filterDockedEntries()) { for (auto entry : filterDockedEntries()) {
if ((entry->isValid()) && desktopFile == entry->getFileName()) { if ((entry->isValid()) && desktopFileInfo.canonicalFilePath() == entry->getFileName()) {
ret = entry; ret = entry;
break; break;
} }