alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT: ws

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1201684
This commit is contained in:
Aaron J. Seigo 2010-11-28 11:12:30 +00:00
parent 2dfedb571a
commit b1fc529c39
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
svg.cpp
View File

@ -99,7 +99,7 @@ bool SharedSvgRenderer::load(
} }
// Apply the style sheet. // Apply the style sheet.
if (styleSheet.isEmpty() || ! contents.contains("current-color-scheme")) { if (styleSheet.isEmpty() || !contents.contains("current-color-scheme")) {
return QSvgRenderer::load(contents); return QSvgRenderer::load(contents);
} }
@ -281,7 +281,6 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, const QSizeF &s)
// Look at the size hinted elements and try to find the smallest one with an // Look at the size hinted elements and try to find the smallest one with an
// identical aspect ratio. // identical aspect ratio.
if (s.isValid() && !elementId.isEmpty()) { if (s.isValid() && !elementId.isEmpty()) {
QList<QSize> elementSizeHints = elementsWithSizeHints.values(elementId); QList<QSize> elementSizeHints = elementsWithSizeHints.values(elementId);
if (!elementSizeHints.isEmpty()) { if (!elementSizeHints.isEmpty()) {
@ -417,8 +416,7 @@ void SvgPrivate::createRenderer()
if (path.isEmpty()) { if (path.isEmpty()) {
renderer = new SharedSvgRenderer(); renderer = new SharedSvgRenderer();
} else { } else {
renderer = new SharedSvgRenderer( renderer = new SharedSvgRenderer(path, actualTheme()->styleSheet("SVG"), elementsWithSizeHints);
path, actualTheme()->styleSheet("SVG"), elementsWithSizeHints);
// Add size hinted elements to the theme's rect cache. // Add size hinted elements to the theme's rect cache.
QHashIterator<QString, QSize> i(elementsWithSizeHints); QHashIterator<QString, QSize> i(elementsWithSizeHints);