mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-12-06 07:12:28 +01:00
Merge branch 'master' into cellPadSet
This commit is contained in:
commit
2db4ae18fd
|
|
@ -117,7 +117,8 @@ void game_list::fix_narrow_columns()
|
||||||
|
|
||||||
void game_list::mousePressEvent(QMouseEvent* event)
|
void game_list::mousePressEvent(QMouseEvent* event)
|
||||||
{
|
{
|
||||||
if (QTableWidgetItem* item = itemAt(event->pos()); !item || !item->data(Qt::UserRole).isValid())
|
// Handle deselction when clicking on empty space in the table
|
||||||
|
if (!itemAt(event->pos()))
|
||||||
{
|
{
|
||||||
clearSelection();
|
clearSelection();
|
||||||
setCurrentItem(nullptr); // Needed for currentItemChanged
|
setCurrentItem(nullptr); // Needed for currentItemChanged
|
||||||
|
|
|
||||||
|
|
@ -243,21 +243,19 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
|
||||||
ui->menuBar->setCornerWidget(corner_bar);
|
ui->menuBar->setCornerWidget(corner_bar);
|
||||||
ui->menuBar->cornerWidget()->setVisible(false);
|
ui->menuBar->cornerWidget()->setVisible(false);
|
||||||
ui->menuBar->removeAction(ui->menuUpdate_Available->menuAction());
|
ui->menuBar->removeAction(ui->menuUpdate_Available->menuAction());
|
||||||
#endif
|
|
||||||
|
|
||||||
ui->menuUpdate_Available->setVisible(false);
|
|
||||||
|
|
||||||
connect(&m_updater, &update_manager::signal_update_available, this, [this](bool update_available)
|
connect(&m_updater, &update_manager::signal_update_available, this, [this](bool update_available)
|
||||||
{
|
{
|
||||||
if (ui->menuUpdate_Available)
|
ui->menuBar->cornerWidget()->setVisible(update_available);
|
||||||
{
|
|
||||||
ui->menuUpdate_Available->setVisible(update_available);
|
|
||||||
}
|
|
||||||
if (ui->menuBar && ui->menuBar->cornerWidget())
|
|
||||||
{
|
|
||||||
ui->menuBar->cornerWidget()->setVisible(update_available);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
#else
|
||||||
|
ui->menuUpdate_Available->menuAction()->setVisible(false);
|
||||||
|
|
||||||
|
connect(&m_updater, &update_manager::signal_update_available, this, [this](bool update_available)
|
||||||
|
{
|
||||||
|
ui->menuUpdate_Available->menuAction()->setVisible(update_available);
|
||||||
|
});
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef RPCS3_UPDATE_SUPPORTED
|
#ifdef RPCS3_UPDATE_SUPPORTED
|
||||||
if (const auto update_value = m_gui_settings->GetValue(gui::m_check_upd_start).toString(); update_value != gui::update_off)
|
if (const auto update_value = m_gui_settings->GetValue(gui::m_check_upd_start).toString(); update_value != gui::update_off)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue