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

fixed refresh problem due to rounding errors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-04 14:57:09 +00:00
parent 71fe5c01eb
commit f0102d2a6d
2 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/newgrid/griddemo.cpp
View File

@@ -84,7 +84,7 @@ GridFrame::GridFrame()
int logW = gridW, logH = 80; int logW = gridW, logH = 80;
wxMenu *fileMenu = new wxMenu; wxMenu *fileMenu = new wxMenu;
fileMenu->Append( wxID_EXIT, "E&xit" ); fileMenu->Append( wxID_EXIT, "E&xit\tAlt-X" );
wxMenu *viewMenu = new wxMenu; wxMenu *viewMenu = new wxMenu;
viewMenu->Append( ID_TOGGLEROWLABELS, "&Row labels", "", TRUE ); viewMenu->Append( ID_TOGGLEROWLABELS, "&Row labels", "", TRUE );

90
src/generic/grid.cpp
View File

@@ -36,7 +36,6 @@
#include "wx/generic/grid.h" #include "wx/generic/grid.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxGridCellCoords wxGridNoCellCoords( -1, -1 );
@@ -47,6 +46,9 @@ wxRect wxGridNoCellRect( -1, -1, -1, -1 );
WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) WX_DEFINE_OBJARRAY(wxGridCellCoordsArray)
// scroll line size
// TODO: fixed so far - make configurable later (and also different for x/y)
static const size_t GRID_SCROLL_LINE = 10;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// //
@@ -139,7 +141,7 @@ wxString wxGridTableBase::GetColLabelValue( int col )
unsigned int i, n; unsigned int i, n;
for ( n = 1; ; n++ ) for ( n = 1; ; n++ )
{ {
s += ('A' + (char)( col%26 )); s += (_T('A') + (wxChar)( col%26 ));
col = col/26 - 1; col = col/26 - 1;
if ( col < 0 ) break; if ( col < 0 ) break;
} }
@@ -670,7 +672,7 @@ void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event )
void wxGridTextCtrl::SetStartValue( const wxString& s ) void wxGridTextCtrl::SetStartValue( const wxString& s )
{ {
startValue = s; startValue = s;
wxTextCtrl::SetValue( s.c_str() ); wxTextCtrl::SetValue(s);
} }
@@ -1104,8 +1106,8 @@ void wxGrid::CalcDimensions()
// //
int x, y; int x, y;
GetViewStart( &x, &y ); GetViewStart( &x, &y );
SetScrollbars( 10, 10, SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
right/10, bottom/10, right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
x, y ); x, y );
} }
} }
@@ -1864,10 +1866,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
m_isDragging = TRUE; m_isDragging = TRUE;
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{ {
// Hide the edit control, so it // Hide the edit control, so it
// won't interfer with drag-shrinking. // won't interfer with drag-shrinking.
if ( IsCellEditControlEnabled() ) if ( IsCellEditControlEnabled() )
HideCellEditControl(); HideCellEditControl();
if ( coords != wxGridNoCellCoords ) if ( coords != wxGridNoCellCoords )
{ {
if ( !IsSelection() ) if ( !IsSelection() )
@@ -1876,7 +1878,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
} }
else else
{ {
SelectBlock( m_currentCellCoords, coords ); SelectBlock( m_currentCellCoords, coords );
} }
} }
} }
@@ -1931,10 +1933,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
} }
} }
// Show the edit control, if it has // Show the edit control, if it has
// been hidden for drag-shrinking. // been hidden for drag-shrinking.
if ( IsCellEditControlEnabled() ) if ( IsCellEditControlEnabled() )
ShowCellEditControl(); ShowCellEditControl();
m_dragLastPos = -1; m_dragLastPos = -1;
} }
@@ -3354,6 +3356,11 @@ void wxGrid::MakeCellVisible( int row, int col )
h += m_rowHeights[i]; h += m_rowHeights[i];
ypos -= m_rowHeights[i]; ypos -= m_rowHeights[i];
} }
// we divide it later by GRID_SCROLL_LINE, make sure that we don't
// have rounding errors (this is important, because if we do, we
// might not scroll at all and some cells won't be redrawn)
ypos += GRID_SCROLL_LINE / 2;
} }
if ( left < 0 ) if ( left < 0 )
@@ -3371,12 +3378,15 @@ void wxGrid::MakeCellVisible( int row, int col )
w += m_colWidths[i]; w += m_colWidths[i];
xpos -= m_colWidths[i]; xpos -= m_colWidths[i];
} }
// see comment for ypos above
xpos += GRID_SCROLL_LINE / 2;
} }
if ( xpos != -1 || ypos != -1 ) if ( xpos != -1 || ypos != -1 )
{ {
if ( xpos != -1 ) xpos = xpos/10; if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
if ( ypos != -1 ) ypos = ypos/10; if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
Scroll( xpos, ypos ); Scroll( xpos, ypos );
AdjustScrollbars(); AdjustScrollbars();
} }
@@ -4310,36 +4320,36 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
if (m_selectedTopLeft != wxGridCellCoords( topRow, leftCol ) ) if (m_selectedTopLeft != wxGridCellCoords( topRow, leftCol ) )
{ {
m_selectedTopLeft = wxGridCellCoords( topRow, leftCol ); m_selectedTopLeft = wxGridCellCoords( topRow, leftCol );
if (updateTopLeft == wxGridNoCellCoords) if (updateTopLeft == wxGridNoCellCoords)
{ {
updateTopLeft = m_selectedTopLeft; updateTopLeft = m_selectedTopLeft;
} }
else else
{ {
if(updateTopLeft.GetRow() > topRow) if(updateTopLeft.GetRow() > topRow)
updateTopLeft.SetRow(topRow); updateTopLeft.SetRow(topRow);
if (updateTopLeft.GetCol() > leftCol) if (updateTopLeft.GetCol() > leftCol)
updateTopLeft.SetCol(leftCol); updateTopLeft.SetCol(leftCol);
} }
changed = true; changed = true;
} }
updateBottomRight = m_selectedBottomRight; updateBottomRight = m_selectedBottomRight;
if (m_selectedBottomRight != wxGridCellCoords( bottomRow, rightCol ) ) if (m_selectedBottomRight != wxGridCellCoords( bottomRow, rightCol ) )
{ {
m_selectedBottomRight = wxGridCellCoords( bottomRow, rightCol ); m_selectedBottomRight = wxGridCellCoords( bottomRow, rightCol );
if (updateBottomRight == wxGridNoCellCoords) if (updateBottomRight == wxGridNoCellCoords)
{ {
updateBottomRight = m_selectedBottomRight; updateBottomRight = m_selectedBottomRight;
} }
else else
{ {
if (updateBottomRight.GetRow() < bottomRow) if (updateBottomRight.GetRow() < bottomRow)
updateBottomRight.SetRow(bottomRow); updateBottomRight.SetRow(bottomRow);
if (updateBottomRight.GetCol() < rightCol) if (updateBottomRight.GetCol() < rightCol)
updateBottomRight.SetCol(rightCol); updateBottomRight.SetCol(rightCol);
} }
changed = true; changed = true;
} }
if (changed) if (changed)