Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-26 01:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix excessive memory usage by icons

Browse Source 
* Fixes #5240
* Limit size of icons being loaded to prevent excessive memory usage in some cases
* Fix loading database icons, previous method would just overwrite the same pixmap and not actually provide caching.
This commit is contained in:
Jonathan White 2020-08-13 22:33:53 -04:00
parent e96d0429cd
commit a5208959c4
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/DatabaseIcons.cpp
View File

@ -40,9 +40,6 @@ namespace
DatabaseIcons::DatabaseIcons() DatabaseIcons::DatabaseIcons()
{ {
// Set the pixmap cache limit to 20 MB
QPixmapCache::setCacheLimit(20480);
iconList = QDir(iconDir).entryList(QDir::NoFilter, QDir::Name); iconList = QDir(iconDir).entryList(QDir::NoFilter, QDir::Name);
badgeList = QDir(badgeDir).entryList(QDir::NoFilter, QDir::Name); badgeList = QDir(badgeDir).entryList(QDir::NoFilter, QDir::Name);
@ -70,9 +67,7 @@ QPixmap DatabaseIcons::icon(int index, IconSize size)
auto icon = m_iconCache.value(cacheKey); auto icon = m_iconCache.value(cacheKey);
if (icon.isNull()) { if (icon.isNull()) {
icon.addFile(iconDir + iconList[index]); icon.addFile(iconDir + iconList[index]);
icon.addPixmap(icon.pixmap(iconSize(IconSize::Default))); icon.addPixmap(icon.pixmap(64));
icon.addPixmap(icon.pixmap(iconSize(IconSize::Medium)));
icon.addPixmap(icon.pixmap(iconSize(IconSize::Large)));
m_iconCache.insert(cacheKey, icon); m_iconCache.insert(cacheKey, icon);
} }

5
src/core/Metadata.cpp
View File

@ -379,11 +379,8 @@ void Metadata::addCustomIcon(const QUuid& uuid, const QImage& image)
static bool isGui = qApp->inherits("QGuiApplication"); static bool isGui = qApp->inherits("QGuiApplication");
if (isGui) { if (isGui) {
// Generate QIcon with pre-baked resolutions // Generate QIcon with pre-baked resolutions
auto basePixmap = QPixmap::fromImage(image).scaled(128, 128, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); auto basePixmap = QPixmap::fromImage(image.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
QIcon icon(basePixmap); QIcon icon(basePixmap);
icon.addPixmap(icon.pixmap(databaseIcons()->iconSize(IconSize::Default)));
icon.addPixmap(icon.pixmap(databaseIcons()->iconSize(IconSize::Medium)));
icon.addPixmap(icon.pixmap(databaseIcons()->iconSize(IconSize::Large)));
m_customIcons.insert(uuid, icon); m_customIcons.insert(uuid, icon);
} else { } else {
m_customIcons.insert(uuid, QIcon()); m_customIcons.insert(uuid, QIcon());

21
src/core/Resources.cpp
View File

@ -164,7 +164,9 @@ QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideC
icon = QIcon::fromTheme(name); icon = QIcon::fromTheme(name);
if (getMainWindow() && recolor) { if (getMainWindow() && recolor) {
QImage img = icon.pixmap(128, 128).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); const QRect rect(0, 0, 48, 48);
QImage img = icon.pixmap(rect.width(), rect.height()).toImage();
img = img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
icon = {}; icon = {};
QPainter painter(&img); QPainter painter(&img);
@ -172,20 +174,19 @@ QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideC
if (!overrideColor.isValid()) { if (!overrideColor.isValid()) {
QPalette palette = getMainWindow()->palette(); QPalette palette = getMainWindow()->palette();
painter.fillRect(0, 0, img.width(), img.height(), palette.color(QPalette::Normal, QPalette::WindowText)); painter.fillRect(rect, palette.color(QPalette::Normal, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal); icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
painter.fillRect(0, 0, img.width(), img.height(), palette.color(QPalette::Active, QPalette::ButtonText)); painter.fillRect(rect, palette.color(QPalette::Active, QPalette::ButtonText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Active); icon.addPixmap(QPixmap::fromImage(img), QIcon::Active);
painter.fillRect( painter.fillRect(rect, palette.color(QPalette::Active, QPalette::HighlightedText));
0, 0, img.width(), img.height(), palette.color(QPalette::Active, QPalette::HighlightedText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Selected); icon.addPixmap(QPixmap::fromImage(img), QIcon::Selected);
painter.fillRect(0, 0, img.width(), img.height(), palette.color(QPalette::Disabled, QPalette::WindowText)); painter.fillRect(rect, palette.color(QPalette::Disabled, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Disabled); icon.addPixmap(QPixmap::fromImage(img), QIcon::Disabled);
} else { } else {
painter.fillRect(0, 0, img.width(), img.height(), overrideColor); painter.fillRect(rect, overrideColor);
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal); icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
} }
@ -211,18 +212,16 @@ QIcon Resources::onOffIcon(const QString& name, bool recolor)
return icon; return icon;
} }
const QSize size(48, 48);
QIcon on = Resources::icon(name + "-on", recolor); QIcon on = Resources::icon(name + "-on", recolor);
for (const auto& size : on.availableSizes()) {
icon.addPixmap(on.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::On); icon.addPixmap(on.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::On); icon.addPixmap(on.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::On); icon.addPixmap(on.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::On);
}
QIcon off = Resources::icon(name + "-off", recolor); QIcon off = Resources::icon(name + "-off", recolor);
for (const auto& size : off.availableSizes()) {
icon.addPixmap(off.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::Off); icon.addPixmap(off.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::Off); icon.addPixmap(off.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::Off); icon.addPixmap(off.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::Off);
}
m_iconCache.insert(cacheName, icon); m_iconCache.insert(cacheName, icon);