X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bdc891f548dce13863001de51327c7f9abaea0d..d6e9e150660b6bc1d35e727f46ddecd3d16b3364:/src/generic/datavgen.cpp?ds=inline diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 8d38670876..18602bcbe2 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -637,7 +637,7 @@ public: // the displaying number of the tree are changing along with the // expanding/collapsing of the tree nodes unsigned int GetLastVisibleRow(); - unsigned int GetRowCount(); + unsigned int GetRowCount() const; const wxDataViewSelection& GetSelections() const { return m_selection; } void SetSelections( const wxDataViewSelection & sel ) @@ -706,7 +706,7 @@ public: void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col); private: - int RecalculateCount(); + int RecalculateCount() const; // Return false only if the event was vetoed by its handler. bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item); @@ -1007,11 +1007,13 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state GetEnabled() == false) flags |= wxCONTROL_DISABLED; - // check boxes we draw must always have the same, standard size (if it's - // bigger than the cell size the checkbox will be truncated because the - // caller had set the clipping rectangle to prevent us from drawing outside - // the cell) - cell.SetSize(GetSize()); + // Ensure that the check boxes always have at least the minimal required + // size, otherwise DrawCheckBox() doesn't really work well. If this size is + // greater than the cell size, the checkbox will be truncated but this is a + // lesser evil. + wxSize size = cell.GetSize(); + size.IncTo(GetSize()); + cell.SetSize(size); wxRendererNative::Get().DrawCheckBox( GetOwner()->GetOwner(), @@ -1187,7 +1189,17 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVar { wxTextCtrl *text = (wxTextCtrl*) editor; - wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon()); + // The icon can't be edited so get its old value and reuse it. + wxVariant valueOld; + wxDataViewColumn* const col = GetOwner(); + GetView()->GetModel()->GetValue(valueOld, m_item, col->GetModelColumn()); + + wxDataViewIconText iconText; + iconText << valueOld; + + // But replace the text with the value entered by user. + iconText.SetText(text->GetValue()); + value << iconText; return true; } @@ -1377,7 +1389,14 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_useCellFocus = false; m_currentRow = 0; - m_lineHeight = wxMax( 17, GetCharHeight() + 4 ); // 17 = mini icon height + 1 +#ifdef __WXMSW__ + // We would like to use the same line height that Explorer uses. This is + // different from standard ListView control since Vista. + if ( wxGetWinVersion() >= wxWinVersion_Vista ) + m_lineHeight = wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height + else +#endif // __WXMSW__ + m_lineHeight = wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height #if wxUSE_DRAG_AND_DROP m_dragCount = 0; @@ -1473,6 +1492,7 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, event.SetItem( item ); event.SetModel( model ); event.SetDataFormat( format ); + event.SetDropEffect( def ); if (!m_owner->HandleWindowEvent( event )) { RemoveDropHint(); @@ -1549,6 +1569,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo event.SetDataFormat( format ); event.SetDataSize( obj->GetSize() ); event.SetDataBuffer( obj->GetData() ); + event.SetDropEffect( def ); if (!m_owner->HandleWindowEvent( event )) return wxDragNone; @@ -2318,7 +2339,17 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, // If this was the last child to be removed, it's possible the parent // node became a leaf. Let's ask the model about it. if ( parentNode->GetChildNodes().empty() ) - parentNode->SetHasChildren(GetModel()->IsContainer(parent)); + { + bool isContainer = GetModel()->IsContainer(parent); + parentNode->SetHasChildren(isContainer); + if ( isContainer ) + { + // If it's still a container, make sure we show "+" icon for it + // and not "-" one as there is nothing to collapse any more. + if ( parentNode->IsOpen() ) + parentNode->ToggleOpen(); + } + } // Update selection by removing 'item' and its entire children tree from the selection. if ( !m_selection.empty() ) @@ -2434,8 +2465,15 @@ bool wxDataViewMainWindow::Cleared() DestroyTree(); m_selection.Clear(); - SortPrepare(); - BuildTree( GetModel() ); + if (GetModel()) + { + SortPrepare(); + BuildTree( GetModel() ); + } + else + { + m_count = 0; + } GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); @@ -2569,12 +2607,14 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() return wxMin( GetRowCount()-1, row ); } -unsigned int wxDataViewMainWindow::GetRowCount() +unsigned int wxDataViewMainWindow::GetRowCount() const { if ( m_count == -1 ) { - m_count = RecalculateCount(); - UpdateDisplay(); + wxDataViewMainWindow* const + self = const_cast(this); + self->m_count = RecalculateCount(); + self->UpdateDisplay(); } return m_count; } @@ -2961,15 +3001,20 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const { + wxDataViewItem item; if (IsVirtualList()) { - return wxDataViewItem( wxUIntToPtr(row+1) ); + if ( row < GetRowCount() ) + item = wxDataViewItem(wxUIntToPtr(row+1)); } else { wxDataViewTreeNode *node = GetTreeNodeByRow(row); - return node ? node->GetItem() : wxDataViewItem(); + if ( node ) + item = node->GetItem(); } + + return item; } bool @@ -3290,7 +3335,7 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, return itemRect; } -int wxDataViewMainWindow::RecalculateCount() +int wxDataViewMainWindow::RecalculateCount() const { if (IsVirtualList()) { @@ -3558,7 +3603,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { case WXK_RETURN: - if ( !event.HasModifiers() ) + if ( event.HasModifiers() ) + { + event.Skip(); + break; + } + else { // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to // it. Only if that event is not handled do we activate column renderer (which @@ -3578,7 +3628,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } case WXK_SPACE: - if ( !event.HasModifiers() ) + if ( event.HasModifiers() ) + { + event.Skip(); + break; + } + else { // Space toggles activatable items or -- if not activatable -- // starts inline editing (this is normally done using F2 on @@ -3608,7 +3663,12 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } case WXK_F2: - if ( !event.HasModifiers() ) + if ( event.HasModifiers() ) + { + event.Skip(); + break; + } + else { if( !m_selection.empty() ) { @@ -3879,9 +3939,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - // set the focus to ourself if any of the mouse buttons are pressed - if(event.ButtonDown() && !HasFocus()) - SetFocus(); + if(event.LeftDown()) + { + // Not skipping this event would prevent the system from setting focus + // to this window. + event.Skip(); + } int x = event.GetX(); int y = event.GetY(); @@ -4044,7 +4107,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewDropSource drag( this, drag_item_row ); drag.SetData( *obj ); - /* wxDragResult res = */ drag.DoDragDrop(); + /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags()); delete obj; } return; @@ -4226,8 +4289,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_currentCol = col; m_currentColSetByKeyboard = false; + // This flag is used to decide whether we should start editing the item + // label. We do it if the user clicks twice (but not double clicks, + // i.e. simulateClick is false) on the same item but not if the click + // was used for something else already, e.g. selecting the item (so it + // must have been already selected) or giving the focus to the control + // (so it must have had focus already). m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && - (current == oldCurrentRow)) && oldWasSelected; + (current == oldCurrentRow)) && oldWasSelected && + HasFocus(); // Call ActivateCell() after everything else as under GTK+ if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) ) @@ -4473,13 +4543,23 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); - - model->AddNotifier( m_notifier ); + if (model) + { + m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); + model->AddNotifier( m_notifier ); + } + else if (m_notifier) + { + m_notifier->Cleared(); + m_notifier = NULL; + } m_clientArea->DestroyTree(); - m_clientArea->BuildTree(model); + if (model) + { + m_clientArea->BuildTree(model); + } m_clientArea->UpdateDisplay(); @@ -4506,7 +4586,7 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return false; m_cols.Append( col ); - m_colsBestWidths.push_back(0); + m_colsBestWidths.push_back(CachedColWidthInfo()); OnColumnsCountChanged(); return true; } @@ -4517,7 +4597,7 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) return false; m_cols.Insert( col ); - m_colsBestWidths.insert(m_colsBestWidths.begin(), 0); + m_colsBestWidths.insert(m_colsBestWidths.begin(), CachedColWidthInfo()); OnColumnsCountChanged(); return true; } @@ -4528,7 +4608,7 @@ bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) return false; m_cols.Insert( pos, col ); - m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0); + m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, CachedColWidthInfo()); OnColumnsCountChanged(); return true; } @@ -4603,8 +4683,8 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const { - if ( m_colsBestWidths[idx] != 0 ) - return m_colsBestWidths[idx]; + if ( m_colsBestWidths[idx].width != 0 ) + return m_colsBestWidths[idx].width; const int count = m_clientArea->GetRowCount(); wxDataViewColumn *column = GetColumn(idx); @@ -4677,6 +4757,8 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const GetModel(), column->GetModelColumn(), m_clientArea->GetRowHeight()); + calculator.UpdateWithWidth(column->GetMinWidth()); + if ( m_headerArea ) calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column)); @@ -4752,7 +4834,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const if ( max_width > 0 ) max_width += 2 * PADDING_RIGHTLEFT; - const_cast(this)->m_colsBestWidths[idx] = max_width; + const_cast(this)->m_colsBestWidths[idx].width = max_width; return max_width; } @@ -4797,12 +4879,14 @@ bool wxDataViewCtrl::ClearColumns() void wxDataViewCtrl::InvalidateColBestWidth(int idx) { - m_colsBestWidths[idx] = 0; + m_colsBestWidths[idx].width = 0; + m_colsBestWidths[idx].dirty = true; m_colsDirty = true; } void wxDataViewCtrl::InvalidateColBestWidths() { + // mark all columns as dirty: m_colsBestWidths.clear(); m_colsBestWidths.resize(m_cols.size()); m_colsDirty = true; @@ -4810,14 +4894,27 @@ void wxDataViewCtrl::InvalidateColBestWidths() void wxDataViewCtrl::UpdateColWidths() { + m_colsDirty = false; + if ( !m_headerArea ) return; const unsigned len = m_colsBestWidths.size(); for ( unsigned i = 0; i < len; i++ ) { - if ( m_colsBestWidths[i] == 0 ) + // Note that we have to have an explicit 'dirty' flag here instead of + // checking if the width==0, as is done in GetBestColumnWidth(). + // + // Testing width==0 wouldn't work correctly if some code called + // GetWidth() after col. width invalidation but before + // wxDataViewCtrl::UpdateColWidths() was called at idle time. This + // would result in the header's column width getting out of sync with + // the control itself. + if ( m_colsBestWidths[i].dirty ) + { m_headerArea->UpdateColumn(i); + m_colsBestWidths[i].dirty = false; + } } } @@ -4826,10 +4923,7 @@ void wxDataViewCtrl::OnInternalIdle() wxDataViewCtrlBase::OnInternalIdle(); if ( m_colsDirty ) - { - m_colsDirty = false; UpdateColWidths(); - } } int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const @@ -5039,14 +5133,20 @@ void wxDataViewCtrl::Expand( const wxDataViewItem & item ) int row = m_clientArea->GetRowByItem( item ); if (row != -1) + { m_clientArea->Expand(row); + InvalidateColBestWidths(); + } } void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) { int row = m_clientArea->GetRowByItem( item ); if (row != -1) + { m_clientArea->Collapse(row); + InvalidateColBestWidths(); + } } bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const