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

GUI: Cache color values in the cpu sidebar drawing

This commit is contained in:
Nukem 2015-11-11 17:01:32 -05:00
parent e009bea0c8
commit 759a384d4c
2 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,18 +10,53 @@ CPUSideBar::CPUSideBar(CPUDisassembly* Ptr, QWidget* parent) : QAbstractScrollAr
CodePtr = Ptr;
InstrBuffer = CodePtr->instructionsBuffer();
memset(&regDump, 0, sizeof(REGDUMP));
updateSlots();
}
CPUSideBar::~CPUSideBar()
{
}
void CPUSideBar::updateSlots()
{
connect(Config(), SIGNAL(colorsUpdated()), this, SLOT(updateColors()));
connect(Config(), SIGNAL(fontsUpdated()), this, SLOT(updateFonts()));
// Init all other updates once
updateColors();
updateFonts();
}
void CPUSideBar::updateColors()
{
mBackgroundColor = ConfigColor("SideBarBackgroundColor");
mConditionalJumpLineFalseColor = ConfigColor("SideBarConditionalJumpLineFalseColor");
mUnconditionalJumpLineFalseColor = ConfigColor("SideBarUnconditionalJumpLineFalseColor");
mConditionalJumpLineTrueColor = ConfigColor("SideBarConditionalJumpLineTrueColor");
mUnconditionalJumpLineTrueColor = ConfigColor("SideBarUnconditionalJumpLineTrueColor");
mBulletBreakpointColor = ConfigColor("SideBarBulletBreakpointColor");
mBulletBookmarkColor = ConfigColor("SideBarBulletBookmarkColor");
mBulletColor = ConfigColor("SideBarBulletColor");
mBulletDisabledBreakpointColor = ConfigColor("SideBarBulletDisabledBreakpointColor");
mCipLabelColor = ConfigColor("SideBarCipLabelColor");
mCipLabelBackgroundColor = ConfigColor("SideBarCipLabelBackgroundColor");
}
void CPUSideBar::updateFonts()
{
m_DefaultFont = CodePtr->font();
this->setFont(m_DefaultFont);
const QFontMetrics metrics(m_DefaultFont);
QFontMetrics metrics(m_DefaultFont);
fontWidth = metrics.width(' ');
fontHeight = metrics.height();
InstrBuffer = CodePtr->instructionsBuffer();
backgroundColor = ConfigColor("SideBarBackgroundColor");
memset(&regDump, 0, sizeof(REGDUMP));
}
QSize CPUSideBar::sizeHint() const
@ -89,7 +124,7 @@ void CPUSideBar::paintEvent(QPaintEvent* event)
QPainter painter(this->viewport());
// Paints background
painter.fillRect(painter.viewport(), ConfigColor("SideBarBackgroundColor"));
painter.fillRect(painter.viewport(), mBackgroundColor);
if(InstrBuffer->size() == 0)
return;
@ -224,9 +259,9 @@ void CPUSideBar::drawJump(QPainter* painter, int startLine, int endLine, int jum
{
painter->save();
if(!conditional)
painter->setPen(QPen(ConfigColor("SideBarConditionalJumpLineFalseColor"), 1, Qt::SolidLine)); // jmp
painter->setPen(QPen(mConditionalJumpLineFalseColor, 1, Qt::SolidLine)); // jmp
else
painter->setPen(QPen(ConfigColor("SideBarUnconditionalJumpLineFalseColor"), 1, Qt::DashLine));
painter->setPen(QPen(mUnconditionalJumpLineFalseColor, 1, Qt::DashLine));
// Pixel adjustment to make drawing lines even
int pixel_y_offs = 1;
@ -245,9 +280,9 @@ void CPUSideBar::drawJump(QPainter* painter, int startLine, int endLine, int jum
if(isexecute)
{
if(!conditional)
activePen.setColor(ConfigColor("SideBarConditionalJumpLineTrueColor"));
activePen.setColor(mConditionalJumpLineTrueColor);
else
activePen.setColor(ConfigColor("SideBarUnconditionalJumpLineTrueColor"));
activePen.setColor(mUnconditionalJumpLineTrueColor);
}
// Update the painter itself with the new pen style
@ -363,13 +398,13 @@ void CPUSideBar::drawBullets(QPainter* painter, int line, bool isbp, bool isbpdi
painter->save();
if(isbp)
painter->setBrush(QBrush(ConfigColor("SideBarBulletBreakpointColor")));
painter->setBrush(QBrush(mBulletBreakpointColor));
else if(isbookmark)
painter->setBrush(QBrush(ConfigColor("SideBarBulletBookmarkColor")));
painter->setBrush(QBrush(mBulletBookmarkColor));
else
painter->setBrush(QBrush(ConfigColor("SideBarBulletColor")));
painter->setBrush(QBrush(mBulletColor));
painter->setPen(ConfigColor("SideBarBackgroundColor"));
painter->setPen(mBackgroundColor);
const int radius = fontHeight / 2; //14/2=7
const int y = line * fontHeight; //initial y
@ -380,7 +415,7 @@ void CPUSideBar::drawBullets(QPainter* painter, int line, bool isbp, bool isbpdi
painter->setRenderHint(QPainter::Antialiasing, true);
if(isbpdisabled) //disabled breakpoint
painter->setBrush(QBrush(ConfigColor("SideBarBulletDisabledBreakpointColor")));
painter->setBrush(QBrush(mBulletDisabledBreakpointColor));
painter->drawEllipse(x, y + yAdd, radius, radius);
painter->restore();
@ -392,8 +427,8 @@ void CPUSideBar::drawLabel(QPainter* painter, int Line, QString Text)
const int LineCoordinate = fontHeight * (1 + Line);
int length = Text.length();
const QColor IPLabel = ConfigColor("SideBarCipLabelColor");
const QColor IPLabelBG = ConfigColor("SideBarCipLabelBackgroundColor");
const QColor& IPLabel = mCipLabelColor;
const QColor& IPLabelBG = mCipLabelBackgroundColor;
int width = length * fontWidth + 2;
int x = 1;

26
src/gui/Src/Gui/CPUSideBar.h
View File

@ -10,7 +10,10 @@ class CPUSideBar : public QAbstractScrollArea
QPair<dsint, dsint> mHighlightedJump;
public:
// Constructors
explicit CPUSideBar(CPUDisassembly* Ptr, QWidget* parent = 0);
~CPUSideBar();
QSize sizeHint() const;
void drawStraightArrow(QPainter* painter, int x1, int y1, int x2, int y2);
@ -18,6 +21,11 @@ public:
static void operator delete(void* p);
public slots:
// Configuration
void updateSlots();
void updateColors();
void updateFonts();
void debugStateChangedSlot(DBGSTATE state);
void repaint();
void changeTopmostAddress(dsint i);
@ -42,8 +50,24 @@ private:
CPUDisassembly* CodePtr;
QList<Instruction_t>* InstrBuffer;
QColor backgroundColor;
REGDUMP regDump;
// Configuration
private:
QColor mBackgroundColor;
QColor mConditionalJumpLineFalseColor;
QColor mUnconditionalJumpLineFalseColor;
QColor mConditionalJumpLineTrueColor;
QColor mUnconditionalJumpLineTrueColor;
QColor mBulletBreakpointColor;
QColor mBulletBookmarkColor;
QColor mBulletColor;
QColor mBulletDisabledBreakpointColor;
QColor mCipLabelColor;
QColor mCipLabelBackgroundColor;
};
#endif // CPUSIDEBAR_H