Take into account interactive flag in more cases (#2208)

* Edge style
* Token highlighting
This commit is contained in:
karliss 2020-05-21 16:31:22 +03:00 committed by GitHub
parent 1181f7ff5c
commit 8a3b51c291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -492,7 +492,7 @@ void DisassemblerGraphView::drawBlock(QPainter &p, GraphView::GraphBlock &block,
} }
// Highlight selected tokens // Highlight selected tokens
if (highlight_token != nullptr) { if (interactive && highlight_token != nullptr) {
int y = firstInstructionY; int y = firstInstructionY;
qreal tokenWidth = mFontMetrics->width(highlight_token->content); qreal tokenWidth = mFontMetrics->width(highlight_token->content);

View File

@ -338,7 +338,7 @@ void GraphView::paint(QPainter &p, QPoint offset, QRect viewport, qreal scale, b
continue; continue;
} }
QPolygonF polyline = edge.polyline; QPolygonF polyline = edge.polyline;
EdgeConfiguration ec = edgeConfiguration(block, &blocks[edge.target]); EdgeConfiguration ec = edgeConfiguration(block, &blocks[edge.target], interactive);
QPen pen(ec.color); QPen pen(ec.color);
pen.setStyle(ec.lineStyle); pen.setStyle(ec.lineStyle);
pen.setWidthF(pen.width() * ec.width_scale); pen.setWidthF(pen.width() * ec.width_scale);