archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Qt: fix game list event filter

Browse source 
Fixes a regression caused by copy pasting the list construction to its
own constructor.
This commit is contained in:
Megamouse 2023-05-08 22:28:05 +02:00
parent d13c0ee393
commit 315d9c308b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -95,6 +95,8 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> gui_settings, std
m_game_grid->scroll_area()->verticalScrollBar()->installEventFilter(this); m_game_grid->scroll_area()->verticalScrollBar()->installEventFilter(this);
m_game_list = new game_list_table(this, m_persistent_settings); m_game_list = new game_list_table(this, m_persistent_settings);
m_game_list->installEventFilter(this);
m_game_list->verticalScrollBar()->installEventFilter(this);
m_game_compat = new game_compatibility(m_gui_settings, this); m_game_compat = new game_compatibility(m_gui_settings, this);
@ -2265,7 +2267,7 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event)
// Zoom gamelist/gamegrid // Zoom gamelist/gamegrid
if (event->type() == QEvent::Wheel && (object == m_game_list->verticalScrollBar() || object == m_game_grid->scroll_area()->verticalScrollBar())) if (event->type() == QEvent::Wheel && (object == m_game_list->verticalScrollBar() || object == m_game_grid->scroll_area()->verticalScrollBar()))
{ {
QWheelEvent *wheel_event = static_cast<QWheelEvent *>(event); QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event);
if (wheel_event->modifiers() & Qt::ControlModifier) if (wheel_event->modifiers() & Qt::ControlModifier)
{ {
@ -2277,7 +2279,7 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event)
} }
else if (event->type() == QEvent::KeyPress && (object == m_game_list || object == m_game_grid)) else if (event->type() == QEvent::KeyPress && (object == m_game_list || object == m_game_grid))
{ {
QKeyEvent *key_event = static_cast<QKeyEvent *>(event); QKeyEvent* key_event = static_cast<QKeyEvent*>(event);
if (key_event->modifiers() & Qt::ControlModifier) if (key_event->modifiers() & Qt::ControlModifier)
{ {

2
rpcs3/rpcs3qt/game_list_table.cpp
View file

@ -28,7 +28,6 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptr<persist
setSelectionMode(QAbstractItemView::SingleSelection); setSelectionMode(QAbstractItemView::SingleSelection);
setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
verticalScrollBar()->installEventFilter(this);
verticalScrollBar()->setSingleStep(20); verticalScrollBar()->setSingleStep(20);
horizontalScrollBar()->setSingleStep(20); horizontalScrollBar()->setSingleStep(20);
verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
@ -41,7 +40,6 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptr<persist
horizontalHeader()->setDefaultAlignment(Qt::AlignLeft); horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
setAlternatingRowColors(true); setAlternatingRowColors(true);
installEventFilter(this);
setColumnCount(gui::column_count); setColumnCount(gui::column_count);
setMouseTracking(true); setMouseTracking(true);