ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-19 10:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix non-mono font token highlighting on graph (#825)

Browse Source
This commit is contained in:
Adam Zambrzycki 2018-10-14 17:44:49 +02:00 committed by xarkes
parent ff4bbb9aa0
commit 4dda930410
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/utils/CachedFontMetrics.h
View File

@ -52,6 +52,29 @@ public:
return mHeight; return mHeight;
} }
int position(const QString &text, int offset)
{
int curWidth = 0;
QChar temp;
for (int i = 0; i < text.length(); i++) {
QChar ch = text[i];
if (ch.isHighSurrogate())
temp = ch;
else if (ch.isLowSurrogate())
curWidth += mFontMetrics.width(QString(temp) + ch);
else
curWidth += width(ch);
if (curWidth >= offset) {
return i;
}
}
return -1;
}
private: private:
QFontMetrics mFontMetrics; QFontMetrics mFontMetrics;
uchar mWidths[0x10000 - 0xE000 + 0xD800]; uchar mWidths[0x10000 - 0xE000 + 0xD800];

10
src/widgets/DisassemblerGraphView.cpp
View File

@ -441,6 +441,7 @@ void DisassemblerGraphView::drawBlock(QPainter &p, GraphView::GraphBlock &block)
// highlight selected tokens // highlight selected tokens
if (highlight_token != nullptr) { if (highlight_token != nullptr) {
int y = block.y + (2 * charWidth) + (db.header_text.lines.size() * charHeight); int y = block.y + (2 * charWidth) + (db.header_text.lines.size() * charHeight);
int tokenWidth = mFontMetrics->width(highlight_token->content);
for (Instr &instr : db.instrs) { for (Instr &instr : db.instrs) {
int pos = -1; int pos = -1;
@ -453,7 +454,8 @@ void DisassemblerGraphView::drawBlock(QPainter &p, GraphView::GraphBlock &block)
continue; continue;
} }
p.fillRect(QRect(block.x + charWidth * 3 + pos * charWidth, y, highlight_token->length * charWidth, int widthBefore = mFontMetrics->width(instr.plainText.left(pos));
p.fillRect(QRect(block.x + charWidth * 3 + widthBefore, y, tokenWidth,
charHeight), disassemblySelectionColor.lighter(250)); charHeight), disassemblySelectionColor.lighter(250));
} }
@ -747,8 +749,12 @@ void DisassemblerGraphView::seekPrev()
DisassemblerGraphView::Token *DisassemblerGraphView::getToken(Instr *instr, int x) DisassemblerGraphView::Token *DisassemblerGraphView::getToken(Instr *instr, int x)
{ {
int clickedCharPos = x / charWidth - 3; x -= (3 * charWidth); // Ignore left margin
if (x < 0) {
return nullptr;
}
int clickedCharPos = mFontMetrics->position(instr->plainText, x);
if (clickedCharPos > instr->plainText.length()) { if (clickedCharPos > instr->plainText.length()) {
return nullptr; return nullptr;
} }