diff options
author | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-05 18:21:09 +0300 |
---|---|---|
committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-08-05 18:21:09 +0300 |
commit | 939a2d67ed75be714e9f3b1b918250d006b3860a (patch) | |
tree | c5700ba93652e26fc1f86235b1a278d90fd0ce91 /launcher/SkinUtils.cpp | |
parent | 6f7d901a1f5c02e0629e4bae9172c04bb81ce0d9 (diff) | |
parent | ae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff) | |
download | PrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.tar.gz PrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.tar.bz2 PrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.zip |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/SkinUtils.cpp')
-rw-r--r-- | launcher/SkinUtils.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/launcher/SkinUtils.cpp b/launcher/SkinUtils.cpp index 1fe0c896..20d3b52e 100644 --- a/launcher/SkinUtils.cpp +++ b/launcher/SkinUtils.cpp @@ -14,17 +14,16 @@ */ #include "SkinUtils.h" -#include "net/HttpMetaCache.h" #include "Application.h" +#include "net/HttpMetaCache.h" #include <QFile> -#include <QPainter> +#include <QJsonArray> #include <QJsonDocument> #include <QJsonObject> -#include <QJsonArray> +#include <QPainter> -namespace SkinUtils -{ +namespace SkinUtils { /* * Given a username, return a pixmap of the cached skin (if it exists), QPixmap() otherwise */ @@ -32,11 +31,9 @@ QPixmap getFaceFromCache(QString username, int height, int width) { QFile fskin(APPLICATION->metacache()->resolveEntry("skins", username + ".png")->getFullPath()); - if (fskin.exists()) - { + if (fskin.exists()) { QPixmap skinTexture(fskin.fileName()); - if(!skinTexture.isNull()) - { + if (!skinTexture.isNull()) { QPixmap skin = QPixmap(8, 8); QPainter painter(&skin); painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8)); @@ -47,4 +44,4 @@ QPixmap getFaceFromCache(QString username, int height, int width) return QPixmap(); } -} +} // namespace SkinUtils |