Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only render columns that are within update region

Browse Source
This commit is contained in:
Artur Wieczorek
2018-12-28 09:32:47 +01:00
parent 95461c566d
commit 9d2fbef751
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/propgrid/propgrid.cpp
View File

@@ -1861,19 +1861,14 @@ void wxPropertyGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
} }
// Find out where the window is scrolled to // Find out where the window is scrolled to
int vy; // Top of the client int vx, vy;
GetViewStart(NULL, &vy); GetViewStart(&vx, &vy);
vx *= wxPG_PIXELS_PER_UNIT;
vy *= wxPG_PIXELS_PER_UNIT; vy *= wxPG_PIXELS_PER_UNIT;
// Update everything inside the box // Update everything inside the box
wxRect r = GetUpdateRegion().GetBox(); wxRect r = GetUpdateRegion().GetBox();
r.Offset(vx, vy);
r.y += vy;
// FIXME: This is just a workaround for a bug that causes splitters not
// to paint when other windows are being dragged over the grid.
r.x = 0;
r.width = GetClientSize().x;
// Repaint this rectangle // Repaint this rectangle
DrawItems(*dcPtr, r.y, r.y + r.height-1, &r); DrawItems(*dcPtr, r.y, r.y + r.height-1, &r);
@@ -2133,8 +2128,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
const wxVector<int>& colWidths = state->m_colWidths; const wxVector<int>& colWidths = state->m_colWidths;
const unsigned int colCount = state->GetColumnCount(); const unsigned int colCount = state->GetColumnCount();
// TODO: Only render columns that are within clipping region.
dc.SetFont(normalFont); dc.SetFont(normalFont);
wxPropertyGridConstIterator it( state, wxPG_ITERATE_VISIBLE, firstItem ); wxPropertyGridConstIterator it( state, wxPG_ITERATE_VISIBLE, firstItem );
@@ -2165,8 +2158,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
wxPGProperty* nextP = visPropArray[0]; wxPGProperty* nextP = visPropArray[0];
int gridWidth = itemsRect->x + itemsRect->width;
// Calculate splitters positions // Calculate splitters positions
wxVector<int> splitterPos; wxVector<int> splitterPos;
splitterPos.reserve(colCount); splitterPos.reserve(colCount);
@@ -2176,8 +2167,18 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
sx += *cit; sx += *cit;
splitterPos.push_back(sx); splitterPos.push_back(sx);
} }
int viewLeftEdge = itemsRect->x - vx;
int viewRightEdge = viewLeftEdge + itemsRect->width - 1;
// Determine columns range to be drawn
unsigned int firstCol = 0;
while ( firstCol < colCount-1 && splitterPos[firstCol] < viewLeftEdge )
firstCol++;
unsigned int lastCol = firstCol;
while ( lastCol < colCount-1 && splitterPos[lastCol] < viewRightEdge )
lastCol++;
// Calculate position of the right edge of the last cell // Calculate position of the right edge of the last cell
int cellX = sx + 1; int cellX = splitterPos[lastCol]+ 1;
y = firstItemTopY; y = firstItemTopY;
for ( unsigned int arrInd=1; for ( unsigned int arrInd=1;
@@ -2236,10 +2237,9 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
} }
// Splitters // Splitters
for (wxVector<int>::const_iterator spit = splitterPos.begin(); spit != splitterPos.end(); ++spit) for (unsigned int i = firstCol; i <= lastCol; i++)
{ {
int spx = *spit; dc.DrawLine(splitterPos[i], y, splitterPos[i], y2);
dc.DrawLine(spx, y, spx, y2);
} }
// Horizontal Line, below // Horizontal Line, below
@@ -2376,7 +2376,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
// Draw cells from back to front so that we can easily tell if the // Draw cells from back to front so that we can easily tell if the
// cell on the right was empty from text // cell on the right was empty from text
bool prevFilled = true; bool prevFilled = true;
unsigned int ci = colCount; unsigned int ci = lastCol + 1;
do do
{ {
ci--; ci--;
@@ -2490,9 +2490,9 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
prevFilled = true; prevFilled = true;
} }
dc.DestroyClippingRegion(); // Is this really necessary? dc.DestroyClippingRegion();
} }
while ( ci > 0 ); while ( ci > firstCol );
if ( fontChanged ) if ( fontChanged )
dc.SetFont(normalFont); dc.SetFont(normalFont);
@@ -2503,7 +2503,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
// Clear empty space beyond the right edge of the grid // Clear empty space beyond the right edge of the grid
dc.SetPen(wxPen(m_colEmptySpace)); dc.SetPen(wxPen(m_colEmptySpace));
dc.SetBrush(wxBrush(m_colEmptySpace)); dc.SetBrush(wxBrush(m_colEmptySpace));
dc.DrawRectangle(cellX, firstItemTopY, gridWidth - cellX, lastItemBottomY - firstItemTopY); dc.DrawRectangle(cellX, firstItemTopY, viewRightEdge - cellX + 1, lastItemBottomY - firstItemTopY);
return y - 1 + vy; return y - 1 + vy;
} }