Merge branch 'develop' into ryzomclassic-develop

ryzomclassic-develop
kaetemi 3 years ago
commit feb7e7a812
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -1039,6 +1039,8 @@ namespace NLGUI
// second loop -> false && break // second loop -> false && break
loop = !loop; loop = !loop;
if (next < parts.size())
{
val = toLowerAscii(parts[next]); val = toLowerAscii(parts[next]);
if (val == "center") if (val == "center")
{ {
@ -1052,7 +1054,7 @@ namespace NLGUI
bgPositionX = val; bgPositionX = val;
// consume 'left|right' // consume 'left|right'
next++; next++;
if(next < parts.size() && getCssLength(fval, unit, parts[next])) if (next < parts.size() && getCssLength(fval, unit, parts[next]))
{ {
bgPositionX += " " + toString("%.0f%s", fval, unit.c_str()); bgPositionX += " " + toString("%.0f%s", fval, unit.c_str());
// consume css length // consume css length
@ -1071,6 +1073,7 @@ namespace NLGUI
next++; next++;
} }
} }
}
} while (loop); } while (loop);
// //

Loading…
Cancel
Save