Debugger: Don't elide func names as much when func start is selected

This commit is contained in:
Ty Lamontagne 2023-10-09 21:38:04 -04:00 committed by Connor McLaughlin
parent 03a7c745c9
commit 065f7d6cc7
2 changed files with 4 additions and 4 deletions

View File

@ -373,7 +373,7 @@ void DisassemblyWidget::paintEvent(QPaintEvent* event)
// Row text // Row text
painter.setPen(GetAddressFunctionColor(rowAddress)); painter.setPen(GetAddressFunctionColor(rowAddress));
QString lineString = DisassemblyStringFromAddress(rowAddress, painter.font(), curPC); QString lineString = DisassemblyStringFromAddress(rowAddress, painter.font(), curPC, rowAddress == m_selectedAddressStart);
painter.drawText(2, i * m_rowHeight, w, m_rowHeight, Qt::AlignLeft, lineString); painter.drawText(2, i * m_rowHeight, w, m_rowHeight, Qt::AlignLeft, lineString);
alternate = !alternate; alternate = !alternate;
@ -683,7 +683,7 @@ void DisassemblyWidget::customMenuRequested(QPoint pos)
contextMenu->popup(this->mapToGlobal(pos)); contextMenu->popup(this->mapToGlobal(pos));
} }
inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFont font, u32 pc) inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFont font, u32 pc, bool selected)
{ {
DisassemblyLineInfo line; DisassemblyLineInfo line;
@ -708,7 +708,7 @@ inline QString DisassemblyWidget::DisassemblyStringFromAddress(u32 address, QFon
{ {
// We want this text elided // We want this text elided
QFontMetrics metric(font); QFontMetrics metric(font);
lineString = lineString.arg(metric.elidedText(QString::fromStdString(addressSymbol), Qt::ElideRight, 8 * font.pointSize())); lineString = lineString.arg(metric.elidedText(QString::fromStdString(addressSymbol), Qt::ElideRight, (selected ? 32 : 8) * font.pointSize()));
} }
lineString = lineString.leftJustified(4, ' ') // Address / symbol lineString = lineString.leftJustified(4, ' ') // Address / symbol

View File

@ -90,7 +90,7 @@ private:
DisassemblyManager m_disassemblyManager; DisassemblyManager m_disassemblyManager;
inline QString DisassemblyStringFromAddress(u32 address, QFont font, u32 pc); inline QString DisassemblyStringFromAddress(u32 address, QFont font, u32 pc, bool selected);
QColor GetAddressFunctionColor(u32 address); QColor GetAddressFunctionColor(u32 address);
enum class SelectionInfo enum class SelectionInfo
{ {