mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
BranchWatchDialog: Resolve Linux FIXME
This stopped being an issue for me with a recent package update, so I guess Qt6 was fixed upstream?
This commit is contained in:
@ -207,7 +207,6 @@ BranchWatchDialog::BranchWatchDialog(Core::System& system, Core::BranchWatch& br
|
||||
{
|
||||
setWindowTitle(tr("Branch Watch Tool"));
|
||||
setWindowFlags((windowFlags() | Qt::WindowMinMaxButtonsHint) & ~Qt::WindowContextHelpButtonHint);
|
||||
SetQWidgetWindowDecorations(this);
|
||||
setLayout([this, &ppc_symbol_db]() {
|
||||
auto* main_layout = new QVBoxLayout;
|
||||
|
||||
@ -241,6 +240,11 @@ BranchWatchDialog::BranchWatchDialog(Core::System& system, Core::BranchWatch& br
|
||||
table_view->setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
table_view->setCornerButtonEnabled(false);
|
||||
table_view->verticalHeader()->hide();
|
||||
table_view->setColumnWidth(Column::Instruction, 50);
|
||||
table_view->setColumnWidth(Column::Condition, 50);
|
||||
table_view->setColumnWidth(Column::OriginSymbol, 250);
|
||||
table_view->setColumnWidth(Column::DestinSymbol, 250);
|
||||
// The default column width (100 units) is fine for the rest.
|
||||
|
||||
QHeaderView* const horizontal_header = table_view->horizontalHeader();
|
||||
horizontal_header->restoreState( // Restore column visibility state.
|
||||
@ -502,16 +506,6 @@ BranchWatchDialog::BranchWatchDialog(Core::System& system, Core::BranchWatch& br
|
||||
return main_layout;
|
||||
}());
|
||||
|
||||
// FIXME: On Linux, Qt6 has recently been resetting column widths to their defaults in many
|
||||
// unexpected ways. This affects all kinds of QTables in Dolphin's GUI, so to avoid it in
|
||||
// this QTableView, I have deferred this operation. Any earlier, and this would be undone.
|
||||
// SetQWidgetWindowDecorations was moved to before these operations for the same reason.
|
||||
m_table_view->setColumnWidth(Column::Instruction, 50);
|
||||
m_table_view->setColumnWidth(Column::Condition, 50);
|
||||
m_table_view->setColumnWidth(Column::OriginSymbol, 250);
|
||||
m_table_view->setColumnWidth(Column::DestinSymbol, 250);
|
||||
// The default column width (100 units) is fine for the rest.
|
||||
|
||||
const auto& settings = Settings::GetQSettings();
|
||||
restoreGeometry(settings.value(QStringLiteral("branchwatchdialog/geometry")).toByteArray());
|
||||
}
|
||||
|
Reference in New Issue
Block a user