aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-26 19:46:38 -0400
committerLioncash <mathew1800@gmail.com>2018-10-27 01:05:56 -0400
commitf7d6c3508564ed4a6f747722fce227d15ca4b80b (patch)
treee38ecd4d7bab1502992cdaf0d227467439bdf19b /src
parentf4272e65b890aa10e3bcd1f77233084b9d21cdfc (diff)
configure_system: Make GetIcon() return the scaled 64x64 icon
Avoids the need to put the scaling parameters all over the place for the common case. The only other time scaling is done is to generate the smaller 48x48 image, so this is fine.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_system.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index f4e892a21b..4b34c1e28a 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -81,7 +81,7 @@ QPixmap GetIcon(Service::Account::UUID uuid) {
icon.loadFromData(backup_jpeg.data(), backup_jpeg.size());
}
- return icon;
+ return icon.scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
}
} // Anonymous namespace
@@ -162,8 +162,7 @@ void ConfigureSystem::PopulateUserList() {
reinterpret_cast<const char*>(profile.username.data()), profile.username.size());
list_items.push_back(QList<QStandardItem*>{new QStandardItem{
- GetIcon(user).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
- FormatUserEntryText(QString::fromStdString(username), user)}});
+ GetIcon(user), FormatUserEntryText(QString::fromStdString(username), user)}});
}
for (const auto& item : list_items)
@@ -256,9 +255,7 @@ void ConfigureSystem::AddUser() {
profile_manager->CreateNewUser(uuid, username.toStdString());
- item_model->appendRow(new QStandardItem{
- GetIcon(uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
- FormatUserEntryText(username, uuid)});
+ item_model->appendRow(new QStandardItem{GetIcon(uuid), FormatUserEntryText(username, uuid)});
}
void ConfigureSystem::RenameUser() {
@@ -292,9 +289,8 @@ void ConfigureSystem::RenameUser() {
item_model->setItem(
user, 0,
- new QStandardItem{
- GetIcon(*uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
- FormatUserEntryText(QString::fromStdString(username_std), *uuid)});
+ new QStandardItem{GetIcon(*uuid),
+ FormatUserEntryText(QString::fromStdString(username_std), *uuid)});
UpdateCurrentUser();
}
@@ -369,10 +365,7 @@ void ConfigureSystem::SetUserImage() {
}
const auto username = GetAccountUsername(*profile_manager, *uuid);
- item_model->setItem(
- index, 0,
- new QStandardItem{
- GetIcon(*uuid).scaled(64, 64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation),
- FormatUserEntryText(username, *uuid)});
+ item_model->setItem(index, 0,
+ new QStandardItem{GetIcon(*uuid), FormatUserEntryText(username, *uuid)});
UpdateCurrentUser();
}