diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2020-07-18 12:31:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 12:31:14 +0200 |
| commit | 814407ccecfaec5032c52c8199acd7ff79fc728f (patch) | |
| tree | d6028bb5b7b2aa2e0f8d2f815023ae3cd4778d9b | |
| parent | cd57e354feb0f01369bc35f6c48f9b893786880d (diff) | |
| parent | 155f4f74710d8a6872aad292746d4e94f54b566d (diff) | |
| download | MultiMC-814407ccecfaec5032c52c8199acd7ff79fc728f.tar MultiMC-814407ccecfaec5032c52c8199acd7ff79fc728f.tar.gz MultiMC-814407ccecfaec5032c52c8199acd7ff79fc728f.tar.lz MultiMC-814407ccecfaec5032c52c8199acd7ff79fc728f.tar.xz MultiMC-814407ccecfaec5032c52c8199acd7ff79fc728f.zip | |
Merge pull request #3241 from Bowser65/feature/render-overlay
Minor: Render the skin overlay in SkinUtils
| -rw-r--r-- | api/gui/SkinUtils.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/api/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp index 9b6f63a4..e9618bd5 100644 --- a/api/gui/SkinUtils.cpp +++ b/api/gui/SkinUtils.cpp @@ -18,6 +18,7 @@ #include "Env.h" #include <QFile> +#include <QPainter> #include <QJsonDocument> #include <QJsonObject> #include <QJsonArray> @@ -35,10 +36,14 @@ QPixmap getFaceFromCache(QString username, int height, int width) if (fskin.exists()) { - QPixmap skin(fskin.fileName()); - if(!skin.isNull()) + QPixmap skinTexture(fskin.fileName()); + if(!skinTexture.isNull()) { - return skin.copy(8, 8, 8, 8).scaled(height, width, Qt::KeepAspectRatio); + QPixmap skin = QPixmap(8, 8); + QPainter painter(&skin); + painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8)); + painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8)); + return skin.scaled(height, width, Qt::KeepAspectRatio); } } |