archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GUI: Make memory viewer address edit accept 0x/0X prefixes

Browse source 
Max length is 10, added regexp validator accordinally.
This commit is contained in:
Eladash 2020-12-17 19:11:51 +02:00 • committed by Megamouse
parent 6c1ca7d797
commit c8947eee6a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -52,9 +52,10 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr)
m_addr_line->setPlaceholderText("00000000"); m_addr_line->setPlaceholderText("00000000");
m_addr_line->setText(qstr(fmt::format("%08x", m_addr))); m_addr_line->setText(qstr(fmt::format("%08x", m_addr)));
m_addr_line->setFont(mono); m_addr_line->setFont(mono);
m_addr_line->setMaxLength(8); m_addr_line->setMaxLength(10);
m_addr_line->setFixedWidth(75); m_addr_line->setFixedWidth(75);
m_addr_line->setFocus(); m_addr_line->setFocus();
m_addr_line->setValidator(new QRegExpValidator(QRegExp("^([0][xX])?[a-fA-F0-9]{0,8}$")));
hbox_tools_mem_addr->addWidget(m_addr_line); hbox_tools_mem_addr->addWidget(m_addr_line);
tools_mem_addr->setLayout(hbox_tools_mem_addr); tools_mem_addr->setLayout(hbox_tools_mem_addr);
@ -207,7 +208,8 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr)
connect(m_addr_line, &QLineEdit::returnPressed, [this]() connect(m_addr_line, &QLineEdit::returnPressed, [this]()
{ {
bool ok; bool ok;
m_addr = m_addr_line->text().toULong(&ok, 16); const QString text = m_addr_line->text();
m_addr = (text.startsWith("0x", Qt::CaseInsensitive) ? text.right(text.size() - 2) : text).toULong(&ok, 16);
m_addr -= m_addr % (m_colcount * 4); // Align by amount of bytes in a row m_addr -= m_addr % (m_colcount * 4); // Align by amount of bytes in a row
m_addr_line->setText(QString("%1").arg(m_addr, 8, 16, QChar('0'))); // get 8 digits in input line m_addr_line->setText(QString("%1").arg(m_addr, 8, 16, QChar('0'))); // get 8 digits in input line
ShowMemory(); ShowMemory();