mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 21:28:51 +00:00
Fix Windows CMake build errors
Lambda expressions with uncaptured constants were leading to errors, and there were also some warnings about deprecated functions (QFontMetrics::width and inet_ntoa).
This commit is contained in:
parent
47d1dec723
commit
bf57abc0d5
4 changed files with 48 additions and 29 deletions
|
@ -194,11 +194,20 @@ void CodeViewWidget::FontBasedSizing()
|
|||
constexpr int extra_text_width = 8;
|
||||
|
||||
const QFontMetrics fm(Settings::Instance().GetDebugFont());
|
||||
|
||||
const auto width = [&fm](QString text) {
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
|
||||
return fm.horizontalAdvance(text);
|
||||
#else
|
||||
return fm.width(text);
|
||||
#endif
|
||||
};
|
||||
|
||||
const int rowh = fm.height() + 1;
|
||||
verticalHeader()->setMaximumSectionSize(rowh);
|
||||
horizontalHeader()->setMinimumSectionSize(rowh + 5);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_BREAKPOINT, rowh + 5);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_ADDRESS, fm.width(QStringLiteral("80000000")) + extra_text_width);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_ADDRESS, width(QStringLiteral("80000000")) + extra_text_width);
|
||||
|
||||
// The longest instruction is technically 'ps_merge00' (0x10000420u), but those instructions are
|
||||
// very rare and would needlessly increase the column size, so let's go with 'rlwinm.' instead.
|
||||
|
@ -210,11 +219,10 @@ void CodeViewWidget::FontBasedSizing()
|
|||
const std::string ins = (split == std::string::npos ? disas : disas.substr(0, split));
|
||||
const std::string param = (split == std::string::npos ? "" : disas.substr(split + 1));
|
||||
setColumnWidth(CODE_VIEW_COLUMN_INSTRUCTION,
|
||||
fm.width(QString::fromStdString(ins)) + extra_text_width);
|
||||
width(QString::fromStdString(ins)) + extra_text_width);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_PARAMETERS,
|
||||
fm.width(QString::fromStdString(param)) + extra_text_width);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_DESCRIPTION,
|
||||
fm.width(QStringLiteral("0")) * 25 + extra_text_width);
|
||||
width(QString::fromStdString(param)) + extra_text_width);
|
||||
setColumnWidth(CODE_VIEW_COLUMN_DESCRIPTION, width(QStringLiteral("0")) * 25 + extra_text_width);
|
||||
|
||||
Update();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue