archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: Fix square custom icons

Browse source
This commit is contained in:
Megamouse 2021-03-12 23:16:41 +01:00
parent 8d0947f07f
commit c0d823f1d8
2 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

51
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -1738,42 +1738,57 @@ void game_list_frame::BatchRemoveShaderCaches()
QApplication::beep(); QApplication::beep();
} }
QPixmap game_list_frame::PaintedPixmap(const QPixmap& icon, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color) QPixmap game_list_frame::PaintedPixmap(QPixmap icon, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color)
{ {
const qreal device_pixel_ratio = devicePixelRatioF(); const qreal device_pixel_ratio = devicePixelRatioF();
constexpr double target_ratio = 320.0 / 176.0; // Size of PS3 ICON0.PNG
QSize target_size(icon.size()); // Let's upscale the original icon to at least fit into the outer rect of the size of PS3's ICON0.PNG
if (icon.width() < 320 || icon.height() < 176)
{
icon = icon.scaled(320, 176, Qt::KeepAspectRatio);
}
QSize canvas_size(icon.size());
QPoint target_pos; QPoint target_pos;
if (icon.width() > icon.height()) // Calculate the centered size and position of the icon on our canvas.
if (icon.width() != 320 || icon.height() != 176)
{ {
target_size.setHeight(icon.width() / target_ratio); constexpr double target_ratio = 320.0 / 176.0; // aspect ratio 20:11
target_pos.setX((target_size.width() - icon.width()) / 2.0);
target_pos.setY((target_size.height() - icon.height()) / 2.0); if (canvas_size.width() > canvas_size.height())
{
canvas_size.setHeight(icon.width() / target_ratio);
} }
else if (icon.width() < icon.height()) else
{ {
target_size.setWidth(icon.height() * target_ratio); canvas_size.setWidth(icon.height() * target_ratio);
target_pos.setX((target_size.width() - icon.width()) / 2.0);
target_pos.setY((target_size.height() - icon.height()) / 2.0);
} }
QPixmap canvas(target_size * device_pixel_ratio); target_pos.setX((canvas_size.width() - icon.width()) / 2.0);
target_pos.setY((canvas_size.height() - icon.height()) / 2.0);
}
// Create a canvas large enough to fit our entire scaled icon
QPixmap canvas(canvas_size * device_pixel_ratio);
canvas.setDevicePixelRatio(device_pixel_ratio); canvas.setDevicePixelRatio(device_pixel_ratio);
canvas.fill(m_icon_color); canvas.fill(m_icon_color);
// Create a painter for our canvas
QPainter painter(&canvas); QPainter painter(&canvas);
painter.setRenderHint(QPainter::SmoothPixmapTransform); painter.setRenderHint(QPainter::SmoothPixmapTransform);
// Draw the icon onto our canvas
if (!icon.isNull()) if (!icon.isNull())
{ {
painter.drawPixmap(target_pos, icon); painter.drawPixmap(target_pos, icon);
} }
// Draw config icons if necessary
if (!m_is_list_layout && (paint_config_icon || paint_pad_config_icon)) if (!m_is_list_layout && (paint_config_icon || paint_pad_config_icon))
{ {
const int width = target_size.width() * 0.2; const int width = canvas_size.width() * 0.2;
const QPoint origin = QPoint(target_size.width() - width, 0); const QPoint origin = QPoint(canvas_size.width() - width, 0);
QString icon_path; QString icon_path;
if (paint_config_icon && paint_pad_config_icon) if (paint_config_icon && paint_pad_config_icon)
@ -1794,19 +1809,23 @@ QPixmap game_list_frame::PaintedPixmap(const QPixmap& icon, bool paint_config_ic
painter.drawPixmap(origin, custom_config_icon.scaled(QSize(width, width) * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation)); painter.drawPixmap(origin, custom_config_icon.scaled(QSize(width, width) * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
} }
// Draw game compatibility icons if necessary
if (compatibility_color.isValid()) if (compatibility_color.isValid())
{ {
const int size = target_size.height() * 0.2; const int size = canvas_size.height() * 0.2;
const int spacing = target_size.height() * 0.05; const int spacing = canvas_size.height() * 0.05;
QColor copyColor = QColor(compatibility_color); QColor copyColor = QColor(compatibility_color);
copyColor.setAlpha(215); // ~85% opacity copyColor.setAlpha(215); // ~85% opacity
painter.setRenderHint(QPainter::Antialiasing); painter.setRenderHint(QPainter::Antialiasing);
painter.setBrush(QBrush(copyColor)); painter.setBrush(QBrush(copyColor));
painter.setPen(QPen(Qt::black, std::max(canvas_size.width() / 320, canvas_size.height() / 176)));
painter.drawEllipse(spacing, spacing, size, size); painter.drawEllipse(spacing, spacing, size, size);
} }
// Finish the painting
painter.end(); painter.end();
// Scale and return our final image
return canvas.scaled(m_icon_size * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation); return canvas.scaled(m_icon_size * device_pixel_ratio, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation);
} }

2
rpcs3/rpcs3qt/game_list_frame.h
View file

@ -105,7 +105,7 @@ protected:
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
bool eventFilter(QObject *object, QEvent *event) override; bool eventFilter(QObject *object, QEvent *event) override;
private: private:
QPixmap PaintedPixmap(const QPixmap& icon, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& color = QColor()); QPixmap PaintedPixmap(QPixmap icon, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& color = QColor());
QColor getGridCompatibilityColor(const QString& string); QColor getGridCompatibilityColor(const QString& string);
void ShowCustomConfigIcon(game_info game); void ShowCustomConfigIcon(game_info game);
void PopulateGameList(); void PopulateGameList();