We'll eventually delete the Plasma::Svg anyway if we failed to find an appropriate icon.
Just need to make sure we don't use isValid with the old source set but this is only done with m_usesPlasmaTheme, hence the new check there, also optimizes the non-themed case.
Details
Details
- Reviewers
davidedmundson - Group Reviewers
Plasma - Commits
- R242:a96330292646: [Icon Item] Don't needlessly unset imagePath
Test still passes, I no longer see setImagePath being called with empty string 400 times on startup
Diff Detail
Diff Detail
- Repository
- R242 Plasma Framework (Library)
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
| src/declarativeimports/core/iconitem.cpp | ||
|---|---|---|
| 199 | are you saying we'll always hit this one? | |
| src/declarativeimports/core/iconitem.cpp | ||
|---|---|---|
| 199 | If we use plasma theme and have valid icon (line 176 does set image path and 181 checks for validity if plasmatheme). If we dont have a plasma theme or failedto load the image in line 176, then we'll try iconloader. if that works, we'll use that. (this line). If that also didn't work we'll dispose of the svgIcon. I don't see a way where we would end up with the old m_svgIcon still being used. | |