ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Memory inspector now shows per-nybble feedback when typing

This commit is contained in:
Jeffrey Pfau 2015-05-27 00:06:44 -07:00
parent 7e411fda30
commit a0624b8b4f
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/platform/qt/MemoryModel.cpp
View File

@ -142,6 +142,10 @@ void MemoryModel::paintEvent(QPaintEvent* event) {
if (isInSelection(address)) {
painter.fillRect(QRectF(QPointF(m_cellSize.width() * x + m_margins.left(), yp), QSizeF(m_cellSize.width() * 2, m_cellSize.height())), palette.highlight());
painter.setPen(palette.color(QPalette::HighlightedText));
if (isEditing(address)) {
drawEditingText(painter, QPointF(m_cellSize.width() * (x + 1.0) - 2 * m_letterWidth + m_margins.left(), yp));
continue;
}
} else {
painter.setPen(palette.color(QPalette::WindowText));
}
@ -156,6 +160,10 @@ void MemoryModel::paintEvent(QPaintEvent* event) {
if (isInSelection(address)) {
painter.fillRect(QRectF(QPointF(m_cellSize.width() * x + m_margins.left(), yp), QSizeF(m_cellSize.width() * 4, m_cellSize.height())), palette.highlight());
painter.setPen(palette.color(QPalette::HighlightedText));
if (isEditing(address)) {
drawEditingText(painter, QPointF(m_cellSize.width() * (x + 2.0) - 4 * m_letterWidth + m_margins.left(), yp));
continue;
}
} else {
painter.setPen(palette.color(QPalette::WindowText));
}
@ -173,6 +181,10 @@ void MemoryModel::paintEvent(QPaintEvent* event) {
if (isInSelection(address)) {
painter.fillRect(QRectF(QPointF(m_cellSize.width() * x + m_margins.left(), yp), m_cellSize), palette.highlight());
painter.setPen(palette.color(QPalette::HighlightedText));
if (isEditing(address)) {
drawEditingText(painter, QPointF(m_cellSize.width() * (x + 0.5) - m_letterWidth + m_margins.left(), yp));
continue;
}
} else {
painter.setPen(palette.color(QPalette::WindowText));
}
@ -286,8 +298,8 @@ void MemoryModel::keyPressEvent(QKeyEvent* event) {
m_selection.second = m_selection.first + m_align;
}
emit selectionChanged(m_selection.first, m_selection.second);
viewport()->update();
}
viewport()->update();
}
void MemoryModel::boundsCheck() {
@ -310,3 +322,21 @@ bool MemoryModel::isInSelection(uint32_t address) {
}
return false;
}
bool MemoryModel::isEditing(uint32_t address) {
return m_bufferedNybbles && m_selection.first == (address & ~(m_align - 1));
}
void MemoryModel::drawEditingText(QPainter& painter, const QPointF& origin) {
QPointF o(origin);
for (int nybbles = m_bufferedNybbles; nybbles > 0; nybbles -= 2) {
if (nybbles > 1) {
uint8_t b = m_buffer >> ((nybbles - 2) * 4);
painter.drawStaticText(o, m_staticNumbers[b]);
} else {
int b = m_buffer & 0xF;
painter.drawStaticText(o, m_staticAscii[b + '0']);
}
o += QPointF(m_letterWidth * 2, 0);
}
}

2
src/platform/qt/MemoryModel.h
View File

@ -50,6 +50,8 @@ private:
void boundsCheck();
bool isInSelection(uint32_t address);
bool isEditing(uint32_t address);
void drawEditingText(QPainter& painter, const QPointF& origin);
ARMCore* m_cpu;
QFont m_font;