From 9024cbb5b8462df113526f5027b88723f4765fdf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 26 Oct 2018 19:46:38 -0400 Subject: [PATCH] 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. --- src/yuzu/configuration/configure_system.cpp | 21 +++++++-------------- 1 file 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(profile.username.data()), profile.username.size()); list_items.push_back(QList{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(); }