Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: simplify icon_ready_callback in game list

Browse source
This commit is contained in:
Megamouse 2025-03-29 11:22:24 +01:00
parent 91427646f5
commit bd1102d3b7
8 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/rpcs3qt/game_list.cpp
View file

@ -8,9 +8,9 @@
game_list::game_list() : QTableWidget(), game_list_base() game_list::game_list() : QTableWidget(), game_list_base()
{ {
m_icon_ready_callback = [this](const game_info& game) m_icon_ready_callback = [this](const movie_item_base* item)
{ {
Q_EMIT IconReady(game); Q_EMIT IconReady(item);
}; };
} }

2
rpcs3/rpcs3qt/game_list.h
View file

@ -36,7 +36,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void FocusToSearchBar(); void FocusToSearchBar();
void IconReady(const game_info& game); void IconReady(const movie_item_base* item);
protected: protected:
movie_item* m_last_hover_item = nullptr; movie_item* m_last_hover_item = nullptr;

2
rpcs3/rpcs3qt/game_list_base.cpp
View file

@ -79,7 +79,7 @@ void game_list_base::IconLoadFunction(game_info game, qreal device_pixel_ratio,
if (!cancel || !cancel->load()) if (!cancel || !cancel->load())
{ {
if (m_icon_ready_callback) if (m_icon_ready_callback)
m_icon_ready_callback(game); m_icon_ready_callback(game->item);
} }
} }

2
rpcs3/rpcs3qt/game_list_base.h
View file

@ -32,7 +32,7 @@ protected:
QPixmap PaintedPixmap(const QPixmap& icon, qreal device_pixel_ratio, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& compatibility_color = {}) const; QPixmap PaintedPixmap(const QPixmap& icon, qreal device_pixel_ratio, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& compatibility_color = {}) const;
QColor GetGridCompatibilityColor(const QString& string) const; QColor GetGridCompatibilityColor(const QString& string) const;
std::function<void(const game_info&)> m_icon_ready_callback{}; std::function<void(const movie_item_base*)> m_icon_ready_callback{};
bool m_draw_compat_status_to_grid{}; bool m_draw_compat_status_to_grid{};
bool m_is_list_layout{}; bool m_is_list_layout{};
QSize m_icon_size{}; QSize m_icon_size{};

9
rpcs3/rpcs3qt/game_list_grid.cpp
View file

@ -14,15 +14,14 @@ game_list_grid::game_list_grid()
setObjectName("game_list_grid"); setObjectName("game_list_grid");
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
m_icon_ready_callback = [this](const game_info& game) m_icon_ready_callback = [this](const movie_item_base* item)
{ {
Q_EMIT IconReady(game); Q_EMIT IconReady(item);
}; };
connect(this, &game_list_grid::IconReady, this, [this](const game_info& game) connect(this, &game_list_grid::IconReady, this, [this](const movie_item_base* item)
{ {
if (!game || !game->item) return; if (item) item->call_icon_func();
game->item->call_icon_func();
}, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case... }, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case...
connect(this, &flow_widget::ItemSelectionChanged, this, [this](int index) connect(this, &flow_widget::ItemSelectionChanged, this, [this](int index)

2
rpcs3/rpcs3qt/game_list_grid.h
View file

@ -33,5 +33,5 @@ Q_SIGNALS:
void FocusToSearchBar(); void FocusToSearchBar();
void ItemDoubleClicked(const game_info& game); void ItemDoubleClicked(const game_info& game);
void ItemSelectionChanged(const game_info& game); void ItemSelectionChanged(const game_info& game);
void IconReady(const game_info& game); void IconReady(const movie_item_base* item);
}; };

5
rpcs3/rpcs3qt/game_list_table.cpp
View file

@ -52,10 +52,9 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptr<persist
} }
}); });
connect(this, &game_list::IconReady, this, [this](const game_info& game) connect(this, &game_list::IconReady, this, [this](const movie_item_base* item)
{ {
if (!game || !game->item) return; if (item) item->call_icon_func();
game->item->call_icon_func();
}); });
} }

2
rpcs3/rpcs3qt/savestate_manager_dialog.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "game_list_base.h" #include "gui_game_info.h"
#include <QWidget> #include <QWidget>
#include <QComboBox> #include <QComboBox>