x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

GUI: Fix off-by-1 pixels when drawing jump arrows

This commit is contained in:
Nukem 2015-11-10 20:16:09 -05:00
parent 3529e9a2ea
commit 3fddd67deb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Src/BasicView/Disassembly.cpp
View File

@ -312,7 +312,7 @@ QString Disassembly::paintContent(QPainter* painter, dsint rowBase, int rowOffse
int funcsize = paintFunctionGraphic(painter, x, y, funcType, false);
//draw jump arrows
int jumpsize = paintJumpsGraphic(painter, x + funcsize, y, wRVA); //jump line
int jumpsize = paintJumpsGraphic(painter, x + funcsize, y - 1, wRVA); //jump line
//draw bytes
QColor bytesColor = ConfigColor("DisassemblyBytesColor");

11
src/gui/Src/Gui/CPUSideBar.cpp
View File

@ -176,6 +176,10 @@ void CPUSideBar::paintEvent(QPaintEvent* event)
void CPUSideBar::mouseReleaseEvent(QMouseEvent* e)
{
// Don't care if we are not debugging
if(!DbgIsDebugging())
return;
// get clicked line
const int x = e->pos().x();
const int y = e->pos().y();
@ -190,9 +194,6 @@ void CPUSideBar::mouseReleaseEvent(QMouseEvent* e)
if(y < bulletY || y > bulletY + bulletRadius)
return;
if(!DbgIsDebugging())
return;
// calculate virtual adress of clicked line
duint wVA = InstrBuffer->at(line).rva + CodePtr->getBase();
@ -244,7 +245,7 @@ void CPUSideBar::drawJump(QPainter* painter, int startLine, int endLine, int jum
const int JumpPadding = 11;
int x = viewport()->width() - jumpoffset * JumpPadding - 12;
int x_right = viewport()->width() - 12;
const int y_start = fontHeight * (1 + startLine) - 0.5 * fontHeight;
const int y_start = fontHeight * (1 + startLine) - 0.5 * fontHeight - 1;
const int y_end = fontHeight * (1 + endLine) - 0.5 * fontHeight;
//horizontal
@ -354,7 +355,7 @@ void CPUSideBar::drawBullets(QPainter* painter, int line, bool isbp, bool isbpdi
const int radius = fontHeight / 2; //14/2=7
const int y = line * fontHeight; //initial y
const int yAdd = (fontHeight - radius) / 2 + 1;
const int yAdd = (fontHeight - radius) / 2;
const int x = viewport()->width() - 10; //initial x
//painter->drawLine(0, y, viewport()->width(), y); //draw raster