X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce5abbf9f5dc0208d9fbc91ad48101f7777299ea..853149575e6cb46031b3ed06f3d0fa4c42440962:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 8f53d7663d..68c7d4bd09 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -48,6 +48,7 @@ #include "wx/imaglist.h" #include "wx/headerctrl.h" #include "wx/dnd.h" +#include "wx/stopwatch.h" //----------------------------------------------------------------------------- // classes @@ -88,14 +89,30 @@ static bool g_asending = true; void wxDataViewColumn::Init(int width, wxAlignment align, int flags) { - m_width = width == wxCOL_WIDTH_DEFAULT ? wxDVC_DEFAULT_WIDTH : width; + m_width = width; m_minWidth = 0; m_align = align; m_flags = flags; m_sort = false; m_sortAscending = true; } - + +int wxDataViewColumn::GetWidth() const +{ + switch ( m_width ) + { + case wxCOL_WIDTH_DEFAULT: + return wxDVC_DEFAULT_WIDTH; + + case wxCOL_WIDTH_AUTOSIZE: + wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" ); + return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this)); + + default: + return m_width; + } +} + void wxDataViewColumn::UpdateDisplay() { if (m_owner) @@ -418,7 +435,7 @@ public: bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemChanged( const wxDataViewItem &item ); - bool ValueChanged( const wxDataViewItem &item, unsigned int col ); + bool ValueChanged( const wxDataViewItem &item, unsigned int model_column ); bool Cleared(); void Resort() { @@ -471,6 +488,7 @@ public: void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); void ScrollTo( int rows, int column ); + unsigned GetCurrentRow() const { return m_currentRow; } bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); @@ -744,10 +762,10 @@ bool wxDataViewTextRenderer::Render(wxRect rect, wxDC *dc, int state) wxSize wxDataViewTextRenderer::GetSize() const { - const wxDataViewCtrl *view = GetView(); if (!m_text.empty()) - return view->wxWindowBase::GetTextExtent( m_text ); - return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); + return GetTextExtent(m_text); + else + return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); } // --------------------------------------------------------- @@ -827,7 +845,8 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state int flags = 0; if (m_toggle) flags |= wxCONTROL_CHECKED; - if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) + if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE || + GetEnabled() == false) flags |= wxCONTROL_DISABLED; // check boxes we draw must always have the same, standard size (if it's @@ -850,7 +869,10 @@ void wxDataViewToggleRenderer::WXOnActivate(wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) { - model->ChangeValue(!valueOld.GetBool(), item, col); + if (model->IsEnabled(item, col)) + { + model->ChangeValue(!valueOld.GetBool(), item, col); + } } wxSize wxDataViewToggleRenderer::GetSize() const @@ -999,11 +1021,7 @@ bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) wxSize wxDataViewDateRenderer::GetSize() const { - const wxDataViewCtrl* view = GetView(); - wxString tmp = m_date.FormatDate(); - wxCoord x,y,d; - view->GetTextExtent( tmp, &x, &y, &d ); - return wxSize(x,y+d); + return GetTextExtent(m_date.FormatDate()); } void wxDataViewDateRenderer::WXOnActivate(wxDataViewModel *model, @@ -1068,15 +1086,13 @@ bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state) wxSize wxDataViewIconTextRenderer::GetSize() const { - const wxDataViewCtrl *view = GetView(); if (!m_value.GetText().empty()) { - int x,y; - view->GetTextExtent( m_value.GetText(), &x, &y ); + wxSize size = GetTextExtent(m_value.GetText()); if (m_value.GetIcon().IsOk()) - x += m_value.GetIcon().GetWidth() + 4; - return wxSize( x, y ); + size.x += m_value.GetIcon().GetWidth() + 4; + return size; } return wxSize(80,20); } @@ -1261,7 +1277,7 @@ void wxDataViewRenameTimer::Notify() //----------------------------------------------------------------------------- // The tree building helper, declared firstly -static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, +static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item, wxDataViewTreeNode * node); int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) @@ -1378,7 +1394,7 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); unsigned int row = GetLineAt( yy ); - if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + if ((row >= GetRowCount()) || (xx > GetEndOfLastCol())) { RemoveDropHint(); return wxDragNone; @@ -1424,7 +1440,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); unsigned int row = GetLineAt( yy ); - if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + if ((row >= GetRowCount()) || (xx > GetEndOfLastCol())) return false; wxDataViewItem item = GetItemByRow( row ); @@ -1453,7 +1469,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); unsigned int row = GetLineAt( yy ); - if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + if ((row >= GetRowCount()) || (xx > GetEndOfLastCol())) return wxDragNone; wxDataViewItem item = GetItemByRow( row ); @@ -1542,14 +1558,8 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) if (column == expander) width -= indent; - wxVariant value; wxDataViewItem item = GetItemByRow( row ); - model->GetValue( value, item, column->GetModelColumn()); - cell->SetValue( value ); - - wxDataViewItemAttr attr; - model->GetAttr(item, column->GetModelColumn(), attr); - cell->SetAttr(attr); + cell->PrepareForItem(model, item, column->GetModelColumn()); wxRect item_rect(x, 0, width, height); item_rect.Deflate(PADDING_RIGHTLEFT, 0); @@ -1731,7 +1741,6 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) for (unsigned int item = item_start; item < item_last; item++) { // get the cell value and set it into the renderer - wxVariant value; wxDataViewTreeNode *node = NULL; wxDataViewItem dataitem; @@ -1752,12 +1761,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dataitem = wxDataViewItem( wxUIntToPtr(item+1) ); } - model->GetValue( value, dataitem, col->GetModelColumn()); - cell->SetValue( value ); - - wxDataViewItemAttr attr; - model->GetAttr(dataitem, col->GetModelColumn(), attr); - cell->SetAttr(attr); + cell->PrepareForItem(model, dataitem, col->GetModelColumn()); // update cell_rect cell_rect.y = GetLineStart( item ); @@ -1893,8 +1897,8 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) ; } - wxDataViewTreeNodes nodes = node->GetNodes(); - wxDataViewTreeLeaves leaves = node->GetChildren(); + const wxDataViewTreeNodes& nodes = node->GetNodes(); + const wxDataViewTreeLeaves& leaves = node->GetChildren(); int len_nodes = nodes.GetCount(); int len = leaves.GetCount(); @@ -1929,6 +1933,8 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { + GetOwner()->InvalidateColBestWidths(); + if (IsVirtualList()) { wxDataViewVirtualListModel *list_model = @@ -1971,6 +1977,8 @@ static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { + GetOwner()->InvalidateColBestWidths(); + if (IsVirtualList()) { wxDataViewVirtualListModel *list_model = @@ -2049,6 +2057,8 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { + GetOwner()->InvalidateColBestWidths(); + SortPrepare(); g_model->Resort(); @@ -2063,8 +2073,24 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) return true; } -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column ) { + int view_column = -1; + unsigned int n_col = m_owner->GetColumnCount(); + for (unsigned i = 0; i < n_col; i++) + { + wxDataViewColumn *column = m_owner->GetColumn( i ); + if (column->GetModelColumn() == model_column) + { + view_column = (int) i; + break; + } + } + if (view_column == -1) + return false; + + GetOwner()->InvalidateColBestWidth(view_column); + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 /*#define MAX_VIRTUAL_WIDTH 100000 @@ -2083,8 +2109,8 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i le.SetEventObject(parent); le.SetModel(GetOwner()->GetModel()); le.SetItem(item); - le.SetColumn(col); - le.SetDataViewColumn(GetOwner()->GetColumn(col)); + le.SetColumn(view_column); + le.SetDataViewColumn(GetOwner()->GetColumn(view_column)); parent->GetEventHandler()->ProcessEvent(le); return true; @@ -2092,7 +2118,10 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i bool wxDataViewMainWindow::Cleared() { + GetOwner()->InvalidateColBestWidths(); + DestroyTree(); + m_selection.Clear(); SortPrepare(); BuildTree( GetOwner()->GetModel() ); @@ -2139,6 +2168,8 @@ void wxDataViewMainWindow::RecalculateDisplay() void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { + m_underMouse = NULL; + wxWindow::ScrollWindow( dx, dy, rect ); if (GetOwner()->m_headerArea) @@ -2147,6 +2178,8 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) void wxDataViewMainWindow::ScrollTo( int rows, int column ) { + m_underMouse = NULL; + int x, y; m_owner->GetScrollPixelsPerUnit( &x, &y ); int sy = GetLineStart( rows )/y; @@ -2496,12 +2529,10 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const !model->HasContainerColumns(item)) continue; // skip it! - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer = const_cast(column->GetRenderer()); - renderer->SetValue( value ); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + height = wxMax( height, renderer->GetSize().y ); } @@ -2559,12 +2590,10 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const !model->HasContainerColumns(item)) continue; // skip it! - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer = const_cast(column->GetRenderer()); - renderer->SetValue( value ); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + height = wxMax( height, renderer->GetSize().y ); } @@ -2612,12 +2641,10 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const !model->HasContainerColumns(item)) continue; // skip it! - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer = const_cast(column->GetRenderer()); - renderer->SetValue( value ); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + height = wxMax( height, renderer->GetSize().y ); } @@ -2964,28 +2991,26 @@ void wxDataViewMainWindow::Collapse(unsigned int row) wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) { - wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetOwner()->GetModel(); if( model == NULL ) return NULL; if (!item.IsOk()) return m_root; - // Compose the a parent-chain of the finding item - ItemList list; - list.DeleteContents( true ); + // Compose the parent-chain for the item we are looking for + wxVector parentChain; wxDataViewItem it( item ); while( it.IsOk() ) { - wxDataViewItem * pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + parentChain.push_back(it); + it = model->GetParent(it); } // Find the item along the parent-chain. // This algorithm is designed to speed up the node-finding method - wxDataViewTreeNode * node = m_root; - for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ ) + wxDataViewTreeNode* node = m_root; + for( unsigned iter = parentChain.size()-1; iter>=0; --iter ) { if( node->HasChildren() ) { @@ -2995,18 +3020,18 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ::BuildTreeHelper(model, node->GetItem(), node); } - wxDataViewTreeNodes nodes = node->GetNodes(); - unsigned int i; + const wxDataViewTreeNodes& nodes = node->GetNodes(); bool found = false; - for (i = 0; i < nodes.GetCount(); i ++) + for (unsigned i = 0; i < nodes.GetCount(); ++i) { - if (nodes[i]->GetItem() == (**iter)) + wxDataViewTreeNode* currentNode = nodes[i]; + if (currentNode->GetItem() == parentChain[iter]) { - if (nodes[i]->GetItem() == item) - return nodes[i]; + if (currentNode->GetItem() == item) + return currentNode; - node = nodes[i]; + node = currentNode; found = true; break; } @@ -3126,7 +3151,7 @@ int wxDataViewMainWindow::RecalculateCount() class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) + ItemToRowJob(const wxDataViewItem& item_, wxVector::reverse_iterator iter) : m_iter(iter), item(item_) { @@ -3142,7 +3167,7 @@ public: return DoJob::OK; } - if( node->GetItem() == **m_iter ) + if( node->GetItem() == *m_iter ) { m_iter++; return DoJob::CONT; @@ -3168,7 +3193,7 @@ public: { return ret -1; } private: - ItemList::const_iterator m_iter; + wxVector::reverse_iterator m_iter; wxDataViewItem item; int ret; @@ -3189,27 +3214,27 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const if( !item.IsOk() ) return -1; - // Compose the a parent-chain of the finding item - ItemList list; - wxDataViewItem * pItem; - list.DeleteContents( true ); + // Compose the parent-chain of the item we are looking for + wxVector parentChain; wxDataViewItem it( item ); while( it.IsOk() ) { - pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + parentChain.push_back(it); + it = model->GetParent(it); } - pItem = new wxDataViewItem( ); - list.Insert( pItem ); - ItemToRowJob job( item, list.begin() ); - Walker(m_root , job ); + // add an 'invalid' item to represent our 'invisible' root node + parentChain.push_back(wxDataViewItem()); + + // the parent chain was created by adding the deepest parent first. + // so if we want to start at the root node, we have to iterate backwards through the vector + ItemToRowJob job( item, parentChain.rbegin() ); + Walker( m_root, job ); return job.GetResult(); } } -static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, +static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item, wxDataViewTreeNode * node) { if( !model->IsContainer( item ) ) @@ -3440,6 +3465,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } + // set the focus to ourself if any of the mouse buttons are pressed + if(event.ButtonDown() && !HasFocus()) + SetFocus(); + int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); @@ -3462,13 +3491,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) xpos += c->GetWidth(); } if (!col) + { + event.Skip(); return; + } wxDataViewRenderer *cell = col->GetRenderer(); unsigned int current = GetLineAt( y ); if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? + event.Skip(); return; } @@ -3616,6 +3649,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); le.SetEventObject(parent); le.SetModel(GetOwner()->GetModel()); @@ -3686,6 +3721,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); le.SetEventObject(parent); le.SetModel(GetOwner()->GetModel()); le.SetValue(value); @@ -3709,8 +3746,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } else if ((event.LeftDown() || simulateClick) && !hoverOverExpander) { - SetFocus(); - m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -3781,9 +3816,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() ) { // notify cell about click - wxVariant value; - model->GetValue( value, item, col->GetModelColumn() ); - custom->SetValue( value ); + custom->PrepareForItem(model, item, col->GetModelColumn()); + wxRect cell_rect( xpos, GetLineStart( current ), col->GetWidth(), GetLineHeight( current ) ); @@ -3814,7 +3848,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) else if ( align & wxALIGN_BOTTOM ) rectItem.y += cell_rect.height - size.y; // else: wxALIGN_TOP is the default - } + } } wxPoint pos( event.GetPosition() ); @@ -3875,6 +3909,7 @@ wxDataViewCtrl::~wxDataViewCtrl() GetModel()->RemoveNotifier( m_notifier ); m_cols.Clear(); + m_colsBestWidths.clear(); } void wxDataViewCtrl::Init() @@ -3888,9 +3923,13 @@ void wxDataViewCtrl::Init() m_headerArea = NULL; } -bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) +bool wxDataViewCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { // if ( (style & wxBORDER_MASK) == 0) // style |= wxBORDER_SUNKEN; @@ -3898,7 +3937,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, Init(); if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle, validator)) + style | wxScrolledWindowStyle, validator, name)) return false; SetInitialSize(size); @@ -4021,6 +4060,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return false; m_cols.Append( col ); + m_colsBestWidths.push_back(0); OnColumnsCountChanged(); return true; } @@ -4031,6 +4071,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) return false; m_cols.Insert( col ); + m_colsBestWidths.insert(m_colsBestWidths.begin(), 0); OnColumnsCountChanged(); return true; } @@ -4041,6 +4082,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) return false; m_cols.Insert( pos, col ); + m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0); OnColumnsCountChanged(); return true; } @@ -4103,6 +4145,143 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const return wxNOT_FOUND; } +unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const +{ + if ( m_colsBestWidths[idx] != 0 ) + return m_colsBestWidths[idx]; + + const int count = m_clientArea->GetRowCount(); + wxDataViewColumn *column = GetColumn(idx); + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + + class MaxWidthCalculator + { + public: + MaxWidthCalculator(wxDataViewMainWindow *clientArea, + wxDataViewRenderer *renderer, + const wxDataViewModel *model, + unsigned column) + : m_width(0), + m_clientArea(clientArea), + m_renderer(renderer), + m_model(model), + m_column(column) + { + } + + void UpdateWithWidth(int width) + { + m_width = wxMax(m_width, width); + } + + void UpdateWithRow(int row) + { + wxDataViewItem item = m_clientArea->GetItemByRow(row); + m_renderer->PrepareForItem(m_model, item, m_column); + m_width = wxMax(m_width, m_renderer->GetSize().x); + } + + int GetMaxWidth() const { return m_width; } + + private: + int m_width; + wxDataViewMainWindow *m_clientArea; + wxDataViewRenderer *m_renderer; + const wxDataViewModel *m_model; + unsigned m_column; + }; + + MaxWidthCalculator calculator(m_clientArea, renderer, + GetModel(), column->GetModelColumn()); + + if ( m_headerArea ) + { + int header_width = m_headerArea->GetTextExtent(column->GetTitle()).x; + // Labels on native MSW header are indented on both sides + header_width += + wxRendererNative::Get().GetHeaderButtonMargin(m_headerArea); + calculator.UpdateWithWidth(header_width); + } + + // The code below deserves some explanation. For very large controls, we + // simply can't afford to calculate sizes for all items, it takes too + // long. So the best we can do is to check the first and the last N/2 + // items in the control for some sufficiently large N and calculate best + // sizes from that. That can result in the calculated best width being too + // small for some outliers, but it's better to get slightly imperfect + // result than to wait several seconds after every update. To avoid highly + // visible miscalculations, we also include all currently visible items + // no matter what. Finally, the value of N is determined dynamically by + // measuring how much time we spent on the determining item widths so far. + +#if wxUSE_STOPWATCH + int top_part_end = count; + static const long CALC_TIMEOUT = 20/*ms*/; + // don't call wxStopWatch::Time() too often + static const unsigned CALC_CHECK_FREQ = 100; + wxStopWatch timer; +#else + // use some hard-coded limit, that's the best we can do without timer + int top_part_end = wxMin(500, count); +#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH + + int row = 0; + + for ( row = 0; row < top_part_end; row++ ) + { +#if wxUSE_STOPWATCH + if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 && + timer.Time() > CALC_TIMEOUT ) + break; +#endif // wxUSE_STOPWATCH + calculator.UpdateWithRow(row); + } + + // row is the first unmeasured item now; that's out value of N/2 + + if ( row < count ) + { + top_part_end = row; + + // add bottom N/2 items now: + const int bottom_part_start = wxMax(row, count - row); + for ( row = bottom_part_start; row < count; row++ ) + { + calculator.UpdateWithRow(row); + } + + // finally, include currently visible items in the calculation: + const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0)); + int first_visible = m_clientArea->GetLineAt(origin.y); + int last_visible = m_clientArea->GetLineAt(origin.y + GetClientSize().y); + + first_visible = wxMax(first_visible, top_part_end); + last_visible = wxMin(bottom_part_start, last_visible); + + for ( row = first_visible; row < last_visible; row++ ) + { + calculator.UpdateWithRow(row); + } + + wxLogTrace("dataview", + "determined best size from %d top, %d bottom plus %d more visible items out of %d total", + top_part_end, + count - bottom_part_start, + wxMax(0, last_visible - first_visible), + count); + } + + int max_width = calculator.GetMaxWidth(); + if ( max_width > 0 ) + max_width += 2 * PADDING_RIGHTLEFT; + + const_cast(this)->m_colsBestWidths[idx] = max_width; + return max_width; + + #undef MEASURE_ITEM +} + void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), unsigned int WXUNUSED(new_pos)) { @@ -4118,6 +4297,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) if (!ret) return false; + m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column)); m_cols.Erase(ret); OnColumnsCountChanged(); @@ -4127,10 +4307,31 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::ClearColumns() { m_cols.Clear(); + m_colsBestWidths.clear(); OnColumnsCountChanged(); return true; } +void wxDataViewCtrl::InvalidateColBestWidth(int idx) +{ + m_colsBestWidths[idx] = 0; + + if ( m_headerArea ) + m_headerArea->UpdateColumn(idx); +} + +void wxDataViewCtrl::InvalidateColBestWidths() +{ + m_colsBestWidths.clear(); + m_colsBestWidths.resize(m_cols.size()); + + if ( m_headerArea ) + { + // this updates visual appearance of columns 0 and up, not just 0 + m_headerArea->UpdateColumn(0); + } +} + int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { #if 1 @@ -4141,7 +4342,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const if (column==col) return i; } - + return wxNOT_FOUND; #else // This returns the position in pixels which is not what we want. @@ -4170,6 +4371,24 @@ wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const : GetColumn(m_sortingColumnIdx); } +wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const +{ + return GetItemByRow(m_clientArea->GetCurrentRow()); +} + +void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) +{ + const int row = m_clientArea->GetRowByItem(item); + + const unsigned oldCurrent = m_clientArea->GetCurrentRow(); + if ( static_cast(row) != oldCurrent ) + { + m_clientArea->ChangeCurrentRow(row); + m_clientArea->RefreshRow(oldCurrent); + m_clientArea->RefreshRow(row); + } +} + // Selection code with wxDataViewItem as parameters wxDataViewItem wxDataViewCtrl::GetSelection() const { @@ -4225,9 +4444,9 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item ) // Unselect all rows before select another in the single select mode if (m_clientArea->IsSingleSel()) m_clientArea->SelectAllRows(false); - + m_clientArea->SelectRow(row, true); - + // Also set focus to the selected item m_clientArea->ChangeCurrentRow( row ); } @@ -4385,6 +4604,8 @@ int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const void wxDataViewCtrl::Expand( const wxDataViewItem & item ) { + ExpandAncestors( item ); + int row = m_clientArea->GetRowByItem( item ); if (row != -1) m_clientArea->Expand(row); @@ -4413,7 +4634,8 @@ void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int colu wxRect itemRect = GetItemRect(item, col); wxDataViewRenderer* renderer = col->GetRenderer(); - renderer->StartEditing(item, itemRect); + if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE) + renderer->StartEditing(item, itemRect); } #endif // !wxUSE_GENERICDATAVIEWCTRL