diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
| commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
| tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /api/gui/SkinUtils.cpp | |
| parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
| download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip | |
merged from 0.6.7 codebase
Diffstat (limited to 'api/gui/SkinUtils.cpp')
| -rw-r--r-- | api/gui/SkinUtils.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/api/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp index 3950cbc0..9b6f63a4 100644 --- a/api/gui/SkinUtils.cpp +++ b/api/gui/SkinUtils.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 MultiMC Contributors +/* Copyright 2013-2019 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,19 +29,19 @@ namespace SkinUtils */ QPixmap getFaceFromCache(QString username, int height, int width) { - QFile fskin(ENV.metacache() - ->resolveEntry("skins", username + ".png") - ->getFullPath()); + QFile fskin(ENV.metacache() + ->resolveEntry("skins", username + ".png") + ->getFullPath()); - if (fskin.exists()) - { - QPixmap skin(fskin.fileName()); - if(!skin.isNull()) - { - return skin.copy(8, 8, 8, 8).scaled(height, width, Qt::KeepAspectRatio); - } - } + if (fskin.exists()) + { + QPixmap skin(fskin.fileName()); + if(!skin.isNull()) + { + return skin.copy(8, 8, 8, 8).scaled(height, width, Qt::KeepAspectRatio); + } + } - return QPixmap(); + return QPixmap(); } } |