mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-11-26 02:08:28 +02:00
Fix the function that sets the icon of a Link
This commit is contained in:
parent
dfad7c39a7
commit
504641a6cf
23
src/link.cpp
23
src/link.cpp
@ -84,24 +84,13 @@ const string &Link::getIcon() {
|
||||
}
|
||||
|
||||
void Link::setIcon(const string &icon) {
|
||||
string skinpath = gmenu2x->sc.getSkinPath(gmenu2x->confStr["skin"]);
|
||||
this->icon = icon;
|
||||
|
||||
if (icon.substr(0,skinpath.length()) == skinpath) {
|
||||
string tempIcon = icon.substr(skinpath.length(), icon.length());
|
||||
string::size_type pos = tempIcon.find("/");
|
||||
if (pos != string::npos)
|
||||
this->icon = "skin:"+tempIcon.substr(pos+1,icon.length());
|
||||
else
|
||||
this->icon = icon;
|
||||
} else {
|
||||
this->icon = icon;
|
||||
}
|
||||
|
||||
iconPath = strreplace(this->icon,"skin:",skinpath+"/");
|
||||
if (iconPath.empty() || !fileExists(iconPath)) {
|
||||
iconPath = strreplace(this->icon,"skin:",gmenu2x->sc.getSkinPath("Default"));
|
||||
if (!fileExists(iconPath)) searchIcon();
|
||||
}
|
||||
if (icon.compare(0, 5, "skin:") == 0)
|
||||
this->iconPath = gmenu2x->sc.getSkinFilePath(
|
||||
icon.substr(5, string::npos));
|
||||
else
|
||||
this->iconPath = icon;
|
||||
|
||||
edited = true;
|
||||
updateSurfaces();
|
||||
|
Loading…
Reference in New Issue
Block a user