From 315d9c308b0096acea71f9d6bdcee9f4b5e58363 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 8 May 2023 22:28:05 +0200 Subject: [PATCH] Qt: fix game list event filter Fixes a regression caused by copy pasting the list construction to its own constructor. --- rpcs3/rpcs3qt/game_list_frame.cpp | 6 ++++-- rpcs3/rpcs3qt/game_list_table.cpp | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 57c98e61cd..8761f46d14 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -95,6 +95,8 @@ game_list_frame::game_list_frame(std::shared_ptr gui_settings, std m_game_grid->scroll_area()->verticalScrollBar()->installEventFilter(this); 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); @@ -2265,7 +2267,7 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event) // Zoom gamelist/gamegrid if (event->type() == QEvent::Wheel && (object == m_game_list->verticalScrollBar() || object == m_game_grid->scroll_area()->verticalScrollBar())) { - QWheelEvent *wheel_event = static_cast(event); + QWheelEvent* wheel_event = static_cast(event); 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)) { - QKeyEvent *key_event = static_cast(event); + QKeyEvent* key_event = static_cast(event); if (key_event->modifiers() & Qt::ControlModifier) { diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index 8f64391699..1a0dba75cb 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -28,7 +28,6 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptrinstallEventFilter(this); verticalScrollBar()->setSingleStep(20); horizontalScrollBar()->setSingleStep(20); verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); @@ -41,7 +40,6 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptrsetDefaultAlignment(Qt::AlignLeft); setContextMenuPolicy(Qt::CustomContextMenu); setAlternatingRowColors(true); - installEventFilter(this); setColumnCount(gui::column_count); setMouseTracking(true);