Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize register list drawing #1079

Merged
merged 2 commits into from
Jan 3, 2016
Merged

Optimize register list drawing #1079

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3dea9b
Optimize register list drawing
Kingcom Jan 1, 2016
c6b60d5
Fix mouse position calculation
Kingcom Jan 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 46 additions & 44 deletions pcsx2/gui/Debugger/CtrlRegisterList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ CtrlRegisterList::CtrlRegisterList(wxWindow* parent, DebugInterface* _cpu)
maxLen = std::max<int>(maxLen,strlen(cpu->getRegisterName(i,k)));
}

int x = 17+(maxLen+3)*charWidth;
int x = 17+(maxLen+2)*charWidth;
startPositions.push_back(x);
currentRows.push_back(0);
}
Expand Down Expand Up @@ -193,72 +193,74 @@ void CtrlRegisterList::OnDraw(wxDC& dc)
#endif
dc.SetFont(font);

// clear background
wxColor white = wxColor(0xFFFFFFFF);

dc.SetBrush(wxBrush(white));
dc.SetPen(wxPen(white));

wxSize size = GetClientSize();
dc.DrawRectangle(0,0,size.x,size.y);

refreshChangedRegs();

wxColor colorChanged = wxColor(0xFF0000FF);
wxColor colorUnchanged = wxColor(0xFF004000);
wxColor colorNormal = wxColor(0xFF600000);

int startRow;
GetViewStart(nullptr,&startRow);
int endRow = startRow + ceil(float(GetClientSize().y) / rowHeight);

// draw categories
int piece = size.x/cpu->getRegisterCategoryCount();
for (int i = 0; i < cpu->getRegisterCategoryCount(); i++)
int width = GetClientSize().x;
if (startRow == 0)
{
const char* name = cpu->getRegisterCategoryName(i);
int piece = width /cpu->getRegisterCategoryCount();
for (int i = 0; i < cpu->getRegisterCategoryCount(); i++)
{
const char* name = cpu->getRegisterCategoryName(i);

int x = i*piece;
int x = i*piece;

if (i == category)
{
dc.SetBrush(wxBrush(wxColor(0xFF70FF70)));
dc.SetPen(wxPen(wxColor(0xFF000000)));
} else {
dc.SetBrush(wxBrush(wxColor(0xFFFFEFE8)));
dc.SetPen(wxPen(wxColor(0xFF000000)));
}
if (i == category)
{
dc.SetBrush(wxBrush(wxColor(0xFF70FF70)));
dc.SetPen(wxPen(wxColor(0xFF000000)));
} else {
dc.SetBrush(wxBrush(wxColor(0xFFFFEFE8)));
dc.SetPen(wxPen(wxColor(0xFF000000)));
}

if (i == cpu->getRegisterCategoryCount()-1)
piece += size.x-piece*cpu->getRegisterCategoryCount()-1;
if (i == cpu->getRegisterCategoryCount()-1)
piece += width-piece*cpu->getRegisterCategoryCount()-1;

dc.DrawRectangle(x,0,piece+1,rowHeight);
dc.DrawRectangle(x,0,piece+1,rowHeight);

// center text
x += (piece-strlen(name)*charWidth)/2;
dc.DrawText(wxString(name,wxConvUTF8),x,2);
// center text
x += (piece-strlen(name)*charWidth)/2;
dc.DrawText(wxString(name,wxConvUTF8),x,2);
}
}

// skip the tab row
startRow = std::max<int>(0,startRow-1);
endRow = std::min<int>(cpu->getRegisterCount(category)-1,endRow-1);

int nameStart = 17;
int valueStart = startPositions[category];

ChangedReg* changedRegs = changedCategories[category];
int registerBits = cpu->getRegisterSize(category);
DebugInterface::RegisterType type = cpu->getRegisterType(category);

for (int i = 0; i < cpu->getRegisterCount(category); i++)
for (int i = startRow; i <= endRow; i++)
{
int x = valueStart;
int y = rowHeight*(i+1);

wxColor backgroundColor;
if (currentRows[category] == i)
{
dc.SetBrush(wxBrush(wxColor(0xFFFFCFC8)));
dc.SetPen(wxPen(wxColor(0xFFFFEFE8)));
dc.DrawRectangle(0,y,size.x,rowHeight);
} else if (i % 2)
{
wxColor color = wxColor(237,242,255,255);
dc.SetBrush(wxBrush(color));
dc.SetPen(wxPen(color));
dc.DrawRectangle(0, y, size.x, rowHeight);
}
backgroundColor = wxColor(0xFFFFCFC8);
else if (i % 2)
backgroundColor = wxColor(237, 242, 255, 255);
else
backgroundColor = wxColor(0xFFFFFFFF);

dc.SetBrush(backgroundColor);
dc.SetPen(backgroundColor);
dc.DrawRectangle(0, y, width, rowHeight);

const char* name = cpu->getRegisterName(category,i);
dc.SetTextForeground(colorNormal);
Expand All @@ -275,7 +277,7 @@ void CtrlRegisterList::OnDraw(wxDC& dc)
case 128:
{
int startIndex = std::min<int>(3,maxBits/32-1);
int actualX = size.x-4-(startIndex+1)*(8*charWidth+2);
int actualX = width-4-(startIndex+1)*(8*charWidth+2);
x = std::max<int>(actualX,x);

if (startIndex != 3)
Expand Down Expand Up @@ -377,10 +379,10 @@ void CtrlRegisterList::changeValue(RegisterChangeMode mode)
oldValue._u64[0] = newValue;
break;
case UPPER64:
oldValue._u64[1] = newValue;
oldValue._u64[1] = newValue;
break;
case CHANGE32:
oldValue._u32[0] = newValue;
oldValue._u32[0] = newValue;
break;
}

Expand Down Expand Up @@ -476,7 +478,7 @@ void CtrlRegisterList::mouseEvent(wxMouseEvent& evt)
wxClientDC dc(this);
wxPoint pos = evt.GetPosition();
int x = dc.DeviceToLogicalX(pos.x) + xOffset;
int y = dc.DeviceToLogicalY(pos.y) + yOffset;
int y = dc.DeviceToLogicalY(pos.y) + yOffset * rowHeight;

if (evt.GetEventType() == wxEVT_RIGHT_UP)
{
Expand Down