X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..8af28fabffca3144a38602fa801205cd1183533c:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 49120ac939..483a1400eb 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -189,7 +189,7 @@ private: { wxDataViewCtrl * const owner = GetOwner(); owner->ColumnMoved(owner->GetColumn(event.GetColumn()), - event.GetNewOrder()); + event.GetNewOrder()); } DECLARE_EVENT_TABLE() @@ -543,8 +543,8 @@ private: // for double click logic unsigned int m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; + m_lineBeforeLastClicked, + m_lineSelectSingleOnUp; // the pen used to draw horiz/vertical rules wxPen m_penRule; @@ -583,7 +583,7 @@ public: virtual bool Cleared() { return m_mainWindow->Cleared(); } virtual void Resort() - { m_mainWindow->Resort(); } + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -641,7 +641,7 @@ int wxDataViewRenderer::CalculateAlignment() const if (m_align == wxDVR_DEFAULT_ALIGNMENT) { if (GetOwner() == NULL) - return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; + return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; } @@ -656,7 +656,7 @@ int wxDataViewRenderer::CalculateAlignment() const IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : + wxDataViewCellMode mode, int align ) : wxDataViewRenderer( varianttype, mode, align ) { } @@ -704,8 +704,8 @@ wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { return new wxTextCtrl( parent, wxID_ANY, value, - wxPoint(labelRect.x,labelRect.y), - wxSize(labelRect.width,labelRect.height) ); + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); } bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) @@ -761,13 +761,13 @@ bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta if (m_attr.GetBold() || m_attr.GetItalic()) { - font = dc->GetFont(); - wxFont myfont = font; - if (m_attr.GetBold()) - myfont.SetWeight( wxFONTWEIGHT_BOLD ); - if (m_attr.GetItalic()) - myfont.SetStyle( wxFONTSTYLE_ITALIC ); - dc->SetFont( myfont ); + font = dc->GetFont(); + wxFont myfont = font; + if (m_attr.GetBold()) + myfont.SetWeight( wxFONTWEIGHT_BOLD ); + if (m_attr.GetItalic()) + myfont.SetStyle( wxFONTSTYLE_ITALIC ); + dc->SetFont( myfont ); } } @@ -861,14 +861,6 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - // User wxRenderer here - - wxRect rect; - rect.x = cell.x + cell.width/2 - 10; - rect.width = 20; - rect.y = cell.y + cell.height/2 - 10; - rect.height = 20; - int flags = 0; if (m_toggle) flags |= wxCONTROL_CHECKED; @@ -878,15 +870,15 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state wxRendererNative::Get().DrawCheckBox( GetOwner()->GetOwner(), *dc, - rect, + cell, flags ); return true; } bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col) + wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col) { bool value = !m_toggle; wxVariant variant = value; @@ -897,7 +889,9 @@ bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), wxSize wxDataViewToggleRenderer::GetSize() const { - return wxSize(20,20); + // the window parameter is not used by GetCheckBoxSize() so it's + // safe to pass NULL + return wxRendererNative::Get().GetCheckBoxSize(NULL); } // --------------------------------------------------------- @@ -1049,7 +1043,7 @@ wxSize wxDataViewDateRenderer::GetSize() const } bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col ) + const wxDataViewItem & item, unsigned int col ) { wxVariant variant; model->GetValue( variant, item, col ); @@ -1075,7 +1069,7 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( - const wxString &varianttype, wxDataViewCellMode mode, int align ) : +const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewCustomRenderer( varianttype, mode, align ) { SetMode(mode); @@ -1129,15 +1123,15 @@ wxSize wxDataViewIconTextRenderer::GetSize() const wxControl * wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), - wxRect WXUNUSED(labelRect), - const wxVariant& WXUNUSED(value)) + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { return NULL; } bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), - wxVariant& WXUNUSED(value)) + wxVariant& WXUNUSED(value)) { return false; } @@ -1152,7 +1146,7 @@ class wxBitmapCanvas: public wxWindow { public: wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) : - wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) + wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) { m_bitmap = bitmap; Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); @@ -1171,7 +1165,7 @@ class wxDataViewDropSource: public wxDropSource { public: wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : - wxDropSource( win ) + wxDropSource( win ) { m_win = win; m_row = row; @@ -1200,12 +1194,12 @@ public: wxBitmap ib = m_win->CreateItemBitmap( m_row, indent ); m_dist_x -= indent; m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString, - wxPoint(pos.x - m_dist_x, pos.y + 5 ), - ib.GetSize(), - wxFRAME_TOOL_WINDOW | - wxFRAME_FLOAT_ON_PARENT | - wxFRAME_NO_TASKBAR | - wxNO_BORDER ); + wxPoint(pos.x - m_dist_x, pos.y + 5 ), + ib.GetSize(), + wxFRAME_TOOL_WINDOW | + wxFRAME_FLOAT_ON_PARENT | + wxFRAME_NO_TASKBAR | + wxNO_BORDER ); new wxBitmapCanvas( m_hint, ib, ib.GetSize() ); m_hint->Show(); } @@ -1236,28 +1230,28 @@ public: virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return wxDragNone; - return m_win->OnDragOver( format, x, y, def); + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + return m_win->OnDragOver( format, x, y, def); } virtual bool OnDrop( wxCoord x, wxCoord y ) { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return false; - return m_win->OnDrop( format, x, y ); + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return false; + return m_win->OnDrop( format, x, y ); } virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) { - wxDataFormat format = GetMatchingPair(); - if (format == wxDF_INVALID) - return wxDragNone; - if (!GetData()) - return wxDragNone; - return m_win->OnData( format, x, y, def ); + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + if (!GetData()) + return wxDragNone; + return m_win->OnData( format, x, y, def ); } virtual void OnLeave() @@ -1526,6 +1520,9 @@ wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) wxDataViewTreeNode *node = GetTreeNodeByRow(row); indent = GetOwner()->GetIndent() * node->GetIndentLevel(); indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space + + if(!node->HasChildren()) + delete node; } width -= indent; @@ -1638,7 +1635,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) unsigned int item_start = GetLineAt( wxMax(0,update.y) ); unsigned int item_count = wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), - (int)(GetRowCount( ) - item_start)); + (int)(GetRowCount( ) - item_start)); unsigned int item_last = item_start + item_count; // compute which columns needs to be redrawn @@ -1678,7 +1675,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetPen(m_penRule); dc.SetBrush(*wxTRANSPARENT_BRUSH); - for (unsigned int i = item_start; i <= item_last+1; i++) + for (unsigned int i = item_start; i <= item_last; i++) { int y = GetLineStart( i ); dc.DrawLine(x_start, y, x_last, y); @@ -1736,7 +1733,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (m_dropHint) { wxRect rect( x_start, GetLineStart( m_dropHintLine ), - x_last, GetLineHeight( m_dropHintLine ) ); + x_last, GetLineHeight( m_dropHintLine ) ); dc.SetPen( *wxBLACK_PEN ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.DrawRectangle( rect ); @@ -1832,8 +1829,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) else wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); } - //force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + //force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); } if (node && !node->HasChildren()) { @@ -1900,7 +1897,11 @@ void wxDataViewMainWindow::OnRenameTimer() // We have to call this here because changes may just have // been made and no screen update taken place. if ( m_dirty ) + { + // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead + // (needs to be tested!) wxSafeYield(); + } int xpos = 0; unsigned int cols = GetOwner()->GetColumnCount(); @@ -1915,17 +1916,30 @@ void wxDataViewMainWindow::OnRenameTimer() break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, - GetLineStart( m_currentRow ), - m_currentCol->GetWidth(), - GetLineHeight( m_currentRow ) ); + + // we have to take an expander column into account and compute its indentation + // to get the editor at the correct x position where the actual text is + int indent = 0; + if (!IsVirtualList() && GetOwner()->GetExpanderColumn() == m_currentCol) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; + + if(!node->HasChildren()) + delete node; + } + + wxRect labelRect( xpos + indent, + GetLineStart( m_currentRow ), + m_currentCol->GetWidth() - indent, + GetLineHeight( m_currentRow ) ); GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, - &labelRect.x, &labelRect.y); + &labelRect.x, &labelRect.y); wxDataViewItem item = GetItemByRow( m_currentRow ); m_currentCol->GetRenderer()->StartEditing( item, labelRect ); - } //------------------------------------------------------------------ @@ -1990,7 +2004,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) continue; case DoJob::CONT: default: - ; + ; } } return false; @@ -2036,7 +2050,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, - const wxDataViewItem& item) + const wxDataViewItem& item) { if (!m_root) { @@ -2274,7 +2288,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, - &client_size.x, &client_size.y ); + &client_size.x, &client_size.y ); //we should deal with the pixel here unsigned int row = GetLineAt(client_size.y) - 1; @@ -2455,7 +2469,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) { wxCHECK_RET( newCurrent < GetRowCount(), - _T("invalid item index in OnArrowChar()") ); + _T("invalid item index in OnArrowChar()") ); // if there is no selection, we cannot move it anywhere if (!HasCurrentRow()) @@ -2585,14 +2599,14 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const unsigned int yy = 0; for (;;) { - const wxDataViewTreeNode* node = GetTreeNodeByRow(row); - if (!node) - { - // not really correct... - return row + ((y-yy) / m_lineHeight); - } + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) + { + // not really correct... + return row + ((y-yy) / m_lineHeight); + } - wxDataViewItem item = node->GetItem(); + wxDataViewItem item = node->GetItem(); if (node && !node->HasChildren()) { @@ -2601,11 +2615,11 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const wxDELETE(node); } - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - int height = m_lineHeight; - for (col = 0; col < cols; col++) - { + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { const wxDataViewColumn *column = GetOwner()->GetColumn(col); if (column->IsHidden()) continue; // skip it! @@ -2619,13 +2633,13 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const wxDataViewRenderer *renderer2 = const_cast(renderer); renderer2->SetValue( value ); height = wxMax( height, renderer->GetSize().y ); - } + } - yy += height; - if (y < yy) - return row; + yy += height; + if (y < yy) + return row; - row++; + row++; } } @@ -2647,7 +2661,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const { // Yes, if the node does not have any child, it must be a leaf which // mean that it is a temporarily created by GetTreeNodeByRow - wxDELETE(node); + wxDELETE(node); } int height = m_lineHeight; @@ -2689,7 +2703,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = node->GetItem(); return DoJob::OK; } @@ -2717,7 +2731,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = wxDataViewItem( n ); return DoJob::OK; } @@ -2760,7 +2774,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = node; return DoJob::OK; } @@ -2794,7 +2808,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); @@ -2838,16 +2852,16 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const { if (IsVirtualList()) - return false; + return false; wxDataViewTreeNode * node = GetTreeNodeByRow(row); if (!node) - return false; + return false; if (!node->HasChildren()) { - delete node; - return false; + delete node; + return false; } return node->IsOpen(); @@ -2857,7 +2871,7 @@ bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const void wxDataViewMainWindow::OnExpanding( unsigned int row ) { if (IsVirtualList()) - return; + return; wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) @@ -2866,22 +2880,39 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) { if( !node->IsOpen()) { - wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); - //Check if the user prevent expanding - if( e.GetSkipped() ) + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); + //Check if the user prevent expanding + if( e.GetSkipped() ) return; - node->ToggleOpen(); - //Here I build the children of current node - if( node->GetChildrenNumber() == 0 ) - { - SortPrepare(); - ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); - } - m_count = -1; - UpdateDisplay(); - //Send the expanded event - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + node->ToggleOpen(); + //Here I build the children of current node + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + } + + // By expanding the node all row indices that are currently in the selection list + // and are greater than our node have become invalid. So we have to correct that now. + const unsigned rowAdjustment = node->GetSubTreeCount(); + for(unsigned i=0; i row) + ChangeCurrentRow(m_currentRow + rowAdjustment); + + m_count = -1; + UpdateDisplay(); + //Send the expanded event + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); } else { @@ -2899,7 +2930,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) void wxDataViewMainWindow::OnCollapsing(unsigned int row) { if (IsVirtualList()) - return; + return; wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) @@ -2911,7 +2942,55 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row) wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); if( e.GetSkipped() ) return; + + // Find out if there are selected items below the current node. + bool selectCollapsingRow = false; + const unsigned rowAdjustment = node->GetSubTreeCount(); + unsigned maxRowToBeTested = row + rowAdjustment; + for(unsigned i=0; i row && testRow <= maxRowToBeTested) + { + selectCollapsingRow = true; + // get out as soon as we have found a node that is selected + break; + } + } + node->ToggleOpen(); + + // If the node to be closed has selected items the user won't see those any longer. + // We select the collapsing node in this case. + if(selectCollapsingRow) + { + SelectAllRows(false); + ChangeCurrentRow(row); + SelectRow(row, true); + SendSelectionChangedEvent(GetItemByRow(row)); + } + else + { + // if there were no selected items below our node we still need to "fix" the + // selection list to adjust for the changing of the row indices. + // We actually do the opposite of what we are doing in OnExpanding(). + for(unsigned i=0; i row && m_currentRow <= maxRowToBeTested) + ChangeCurrentRow(row); + else if(m_currentRow > row) + ChangeCurrentRow(m_currentRow - rowAdjustment); + } + m_count = -1; UpdateDisplay(); SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem()); @@ -2978,7 +3057,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item if (nodes[i]->GetItem() == (**iter)) { if (nodes[i]->GetItem() == item) - return nodes[i]; + return nodes[i]; node = nodes[i]; found = true; @@ -3027,10 +3106,10 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD wxDataViewColumn *col = NULL; for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ ) { - col = GetOwner()->GetColumnAt( i ); - x += col->GetWidth(); - if( GetOwner()->GetColumnAt(i+1) == column ) - break; + col = GetOwner()->GetColumnAt( i ); + x += col->GetWidth(); + if( GetOwner()->GetColumnAt(i+1) == column ) + break; } int w = col->GetWidth(); m_owner->CalcScrolledPosition( x, y, &x, &y ); @@ -3059,7 +3138,7 @@ class ItemToRowJob : public DoJob public: ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) : m_iter(iter), - item(item_) + item(item_) { ret = -1; } @@ -3067,22 +3146,22 @@ public: //Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) { - ret ++; - if( node->GetItem() == item ) - { - return DoJob::OK; - } + ret ++; + if( node->GetItem() == item ) + { + return DoJob::OK; + } - if( node->GetItem() == **m_iter ) - { - m_iter++; - return DoJob::CONT; - } - else - { - ret += node->GetSubTreeCount(); - return DoJob::IGR; - } + if( node->GetItem() == **m_iter ) + { + m_iter++; + return DoJob::CONT; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::IGR; + } } @@ -3208,7 +3287,7 @@ void wxDataViewMainWindow::DestroyTree() { if (!IsVirtualList()) { - ::DestroyTreeHelper(m_root); + ::DestroyTreeHelper(m_root); m_count = 0; m_root = NULL; } @@ -3257,11 +3336,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; //Add the process for tree expanding/collapsing case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -3342,7 +3421,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } //Test whether the mouse is hovered on the tree item button - bool hover = false; + bool hoverOverExpander = false; if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); @@ -3350,14 +3429,16 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { int indent = node->GetIndentLevel(); indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - if( rect.Contains( x, y) ) + + // we make the rectangle we are looking in a bit bigger than the actual + // visual expander so the user can hit that little thing reliably + wxRect rect( xpos + indent, + GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, + m_lineHeight, m_lineHeight); + if( rect.Contains(x, y) ) { //So the mouse is over the expander - hover = true; + hoverOverExpander = true; if (m_underMouse && m_underMouse != node) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); @@ -3374,7 +3455,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (node!=NULL && !node->HasChildren()) delete node; } - if (!hover) + if (!hoverOverExpander) { if (m_underMouse != NULL) { @@ -3436,7 +3517,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } #endif // wxUSE_DRAG_AND_DROP - bool forceClick = false; + bool simulateClick = false; if (event.ButtonDClick()) { @@ -3447,12 +3528,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewItem item = GetItemByRow(current); bool ignore_other_columns = ((GetOwner()->GetExpanderColumn() != col) && - (model->IsContainer(item)) && - (!model->HasContainerColumns(item))); + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); if (event.LeftDClick()) { - if ( current == m_lineLastClicked ) + if(hoverOverExpander) + { + // a double click on the expander will be converted into a "simulated" normal click + simulateClick = true; + } + else if ( current == m_lineLastClicked ) { if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) { @@ -3460,7 +3546,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + col->GetWidth(), GetLineHeight( current ) ); cell->Activate( cell_rect, model, item, col->GetModelColumn() ); } @@ -3480,11 +3566,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { // The first click was on another item, so don't interpret this as // a double click, but as a simple click instead - forceClick = true; + simulateClick = true; } } - if (event.LeftUp()) + if (event.LeftUp() && !hoverOverExpander) { if (m_lineSelectSingleOnUp != (unsigned int)-1) { @@ -3494,34 +3580,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) ); } - //Process the event of user clicking the expander - bool expander = false; - if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) - { - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) - { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - - if( rect.Contains( x, y) ) - { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); - } - } - if (node && !node->HasChildren()) - delete node; - } //If the user click the expander, we do not do editing even if the column with expander are editable - if (m_lastOnSame && !expander && !ignore_other_columns) + if (m_lastOnSame && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) @@ -3533,7 +3593,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; m_lineSelectSingleOnUp = (unsigned int)-1; } - else + else if(!event.LeftUp()) { // This is necessary, because after a DnD operation in // from and to ourself, the up event is swallowed by the @@ -3570,7 +3630,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) else if (event.MiddleDown()) { } - if (event.LeftDown() || forceClick) + + if((event.LeftDown() || simulateClick) && hoverOverExpander) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(current); + // hoverOverExpander being true tells us that our node must be valid and have children. + // So we don't need any extra checks. + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding(current); + } + else if ((event.LeftDown() || simulateClick) && !hoverOverExpander) { SetFocus(); @@ -3609,7 +3680,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) ChangeCurrentRow(current); unsigned int lineFrom = oldCurrentRow, - lineTo = current; + lineTo = current; if ( lineTo < lineFrom ) { @@ -3635,7 +3706,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; // Call LeftClick after everything else as under GTK+ @@ -3646,7 +3717,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + col->GetWidth(), GetLineHeight( current ) ); /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn()); } } @@ -3711,8 +3782,8 @@ void wxDataViewCtrl::Init() } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) + const wxPoint& pos, const wxSize& size, + long style, const wxValidator& validator ) { // if ( (style & wxBORDER_MASK) == 0) // style |= wxBORDER_SUNKEN; @@ -3754,8 +3825,8 @@ wxBorder wxDataViewCtrl::GetDefaultBorder() const #ifdef __WXMSW__ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam); @@ -3775,7 +3846,7 @@ wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) { wxSize newsize = size; if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea)) - newsize.y -= m_headerArea->GetSize().y; + newsize.y -= m_headerArea->GetSize().y; return newsize; } @@ -3903,7 +3974,7 @@ wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const // columns can't be reordered if there is no header window which allows // to do this const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos] - : pos; + : pos; return GetColumn(idx); } @@ -3921,7 +3992,7 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const } void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), - unsigned int WXUNUSED(new_pos)) + unsigned int WXUNUSED(new_pos)) { // do _not_ reorder m_cols elements here, they should always be in the // order in which columns were added, we only display the columns in @@ -3971,7 +4042,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const { return m_sortingColumnIdx == wxNOT_FOUND ? NULL - : GetColumn(m_sortingColumnIdx); + : GetColumn(m_sortingColumnIdx); } //Selection code with wxDataViewItem as parameters @@ -4204,7 +4275,7 @@ bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const } - #endif +#endif // !wxUSE_GENERICDATAVIEWCTRL #endif