mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 00:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: simplify game list icon resize

Browse Source
This commit is contained in:
Megamouse 2019-07-27 10:21:49 +02:00
parent 1de90bdb1f
commit 76a1fd5c88
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -504,10 +504,10 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter)
game.category = sstr(category::other); game.category = sstr(category::other);
} }
// Load Image // Load ICON0.PNG
QImage img; QPixmap icon;
if (game.icon_path.empty() || !img.load(qstr(game.icon_path))) if (game.icon_path.empty() || !icon.load(qstr(game.icon_path)))
{ {
LOG_WARNING(GENERAL, "Could not load image from path %s", sstr(QDir(qstr(game.icon_path)).absolutePath())); LOG_WARNING(GENERAL, "Could not load image from path %s", sstr(QDir(qstr(game.icon_path)).absolutePath()));
} }
@ -518,9 +518,9 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter)
const bool hasCustomPadConfig = fs::is_file(Emulator::GetCustomInputConfigPath(game.serial)); const bool hasCustomPadConfig = fs::is_file(Emulator::GetCustomInputConfigPath(game.serial));
const QColor color = getGridCompatibilityColor(compat.color); const QColor color = getGridCompatibilityColor(compat.color);
const QPixmap pxmap = PaintedPixmap(img, hasCustomConfig, hasCustomPadConfig, color); const QPixmap pxmap = PaintedPixmap(icon, hasCustomConfig, hasCustomPadConfig, color);
m_game_data.push_back(game_info(new gui_game_info{game, compat, img, pxmap, hasCustomConfig, hasCustomPadConfig})); m_game_data.push_back(game_info(new gui_game_info{game, compat, icon, pxmap, hasCustomConfig, hasCustomPadConfig}));
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -1469,20 +1469,20 @@ void game_list_frame::BatchRemoveShaderCaches()
QApplication::beep(); QApplication::beep();
} }
QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color) QPixmap game_list_frame::PaintedPixmap(const QPixmap& icon, bool paint_config_icon, bool paint_pad_config_icon, const QColor& compatibility_color)
{ {
const int device_pixel_ratio = devicePixelRatio(); const int device_pixel_ratio = devicePixelRatio();
const QSize original_size = img.size(); const QSize original_size = icon.size();
QImage image = QImage(original_size * device_pixel_ratio, QImage::Format_ARGB32); QPixmap canvas = QPixmap(original_size * device_pixel_ratio);
image.setDevicePixelRatio(device_pixel_ratio); canvas.setDevicePixelRatio(device_pixel_ratio);
image.fill(m_Icon_Color); canvas.fill(m_Icon_Color);
QPainter painter(&image); QPainter painter(&canvas);
if (!img.isNull()) if (!icon.isNull())
{ {
painter.drawImage(QPoint(0, 0), img); painter.drawPixmap(QPoint(0, 0), icon);
} }
if (!m_isListLayout && (paint_config_icon || paint_pad_config_icon)) if (!m_isListLayout && (paint_config_icon || paint_pad_config_icon))
@ -1504,9 +1504,9 @@ QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paint_config_icon
icon_path = ":/Icons/controllers_2.png"; icon_path = ":/Icons/controllers_2.png";
} }
QImage custom_config_icon(icon_path); QPixmap custom_config_icon(icon_path);
custom_config_icon.setDevicePixelRatio(device_pixel_ratio); custom_config_icon.setDevicePixelRatio(device_pixel_ratio);
painter.drawImage(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));
} }
if (compatibility_color.isValid()) if (compatibility_color.isValid())
@ -1521,7 +1521,7 @@ QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paint_config_icon
painter.end(); painter.end();
return QPixmap::fromImage(image.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);
} }
void game_list_frame::ShowCustomConfigIcon(QTableWidgetItem* item) void game_list_frame::ShowCustomConfigIcon(QTableWidgetItem* item)

4
rpcs3/rpcs3qt/game_list_frame.h
View File

@ -168,7 +168,7 @@ struct gui_game_info
{ {
GameInfo info; GameInfo info;
compat_status compat; compat_status compat;
QImage icon; QPixmap icon;
QPixmap pxmap; QPixmap pxmap;
bool hasCustomConfig; bool hasCustomConfig;
bool hasCustomPadConfig; bool hasCustomPadConfig;
@ -236,7 +236,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 QImage& img, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& color = QColor()); QPixmap PaintedPixmap(const 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(QTableWidgetItem* item); void ShowCustomConfigIcon(QTableWidgetItem* item);
void PopulateGameGrid(int maxCols, const QSize& image_size, const QColor& image_color); void PopulateGameGrid(int maxCols, const QSize& image_size, const QColor& image_color);