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

Take into account cell's own size, not only the

Browse Source 
space allocated to it (mostly much more).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-03-23 19:00:53 +00:00
parent 55f5548f78
commit 4064f7deac
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/datavgen.cpp
View File

@@ -706,7 +706,19 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &event )
wxVariant value; wxVariant value;
model->GetValue( value, col->GetModelColumn(), item ); model->GetValue( value, col->GetModelColumn(), item );
cell->SetValue( value ); cell->SetValue( value );
cell->Render( cell_rect, &dc, 0 ); wxSize size = cell->GetSize();
// cannot be bigger than allocated space
size.x = wxMin( size.x, cell_rect.width );
size.y = wxMin( size.y, cell_rect.height );
// TODO: check for left/right/centre alignment here
wxRect item_rect;
// for now: centre
item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
item_rect.width = size.x;
item_rect.height= size.y;
cell->Render( item_rect, &dc, 0 );
} }
cell_rect.x += cell_rect.width; cell_rect.x += cell_rect.width;