svn path=/trunk/KDE/kdelibs/; revision=1185501
This commit is contained in:
Aaron J. Seigo 2010-10-13 14:27:08 +00:00
parent 4c5f141992
commit a92f14160d

View File

@ -325,7 +325,7 @@ void FrameSvg::resizeFrame(const QSizeF &size)
d->updateSizes(); d->updateSizes();
fd->frameSize = size.toSize(); fd->frameSize = size.toSize();
// we know it isn't in s_sharedFrames do the check above, so insert it now // we know it isn't in s_sharedFrames due to the check above, so insert it now
FrameSvgPrivate::s_sharedFrames.insert(newKey, fd); FrameSvgPrivate::s_sharedFrames.insert(newKey, fd);
} }
@ -873,8 +873,9 @@ void FrameSvgPrivate::generateFrameBackground(FrameData *frame)
QString FrameSvgPrivate::cacheId(FrameData *frame, const QString &prefixToSave) const QString FrameSvgPrivate::cacheId(FrameData *frame, const QString &prefixToSave) const
{ {
const QSize size = frameSize(frame).toSize(); const QSize size = frameSize(frame).toSize();
const QChar s('_'); const QLatin1Char s('_');
return QString::number(frame->enabledBorders) % s % QString::number(size.width()) % s % QString::number(size.height()) % s % prefixToSave % s % q->imagePath(); const QLatin1Char b(frame->enabledBorders ? '1' : '0');
return b % s % QString::number(size.width()) % s % QString::number(size.height()) % s % prefixToSave % s % q->imagePath();
} }
void FrameSvgPrivate::cacheFrame(const QString &prefixToSave, const QPixmap &background, const QPixmap &overlay) void FrameSvgPrivate::cacheFrame(const QString &prefixToSave, const QPixmap &background, const QPixmap &overlay)