X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98f8e6666b4622a7dc96292f9dfb215af81573d7..fc9ab22a7692aa822bb3d8e6326dfb73d12a600b:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 90a1241631..cf63855f78 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -145,7 +145,6 @@ protected: return *(GetOwner()->GetColumn(idx)); } - // FIXME: currently unused virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) { wxDataViewCtrl * const owner = GetOwner(); @@ -435,7 +434,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() { @@ -864,15 +863,23 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -void wxDataViewToggleRenderer::WXOnActivate(wxDataViewModel *model, - const wxVariant& valueOld, - const wxDataViewItem & item, - unsigned int col) +bool wxDataViewToggleRenderer::WXOnLeftClick(const wxPoint& cursor, + const wxRect& WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col) { + // only react to clicks directly on the checkbox, not elsewhere in the same cell: + if (!wxRect(GetSize()).Contains(cursor)) + return false; + if (model->IsEnabled(item, col)) { - model->ChangeValue(!valueOld.GetBool(), item, col); + model->ChangeValue(!m_toggle, item, col); + return true; } + + return false; } wxSize wxDataViewToggleRenderer::GetSize() const @@ -1024,12 +1031,12 @@ wxSize wxDataViewDateRenderer::GetSize() const return GetTextExtent(m_date.FormatDate()); } -void wxDataViewDateRenderer::WXOnActivate(wxDataViewModel *model, - const wxVariant& valueOld, - const wxDataViewItem & item, - unsigned int col ) +bool wxDataViewDateRenderer::WXOnActivate(const wxRect& WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col) { - wxDateTime dtOld = valueOld.GetDateTime(); + wxDateTime dtOld = m_date; #if wxUSE_DATE_RENDERER_POPUP wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( @@ -1041,6 +1048,8 @@ void wxDataViewDateRenderer::WXOnActivate(wxDataViewModel *model, #else // !wxUSE_DATE_RENDERER_POPUP wxMessageBox(dtOld.Format()); #endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP + + return true; } // --------------------------------------------------------- @@ -1601,10 +1610,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), (int)(GetRowCount( ) - item_start)); unsigned int item_last = item_start + item_count; - // Get the parent of DataViewCtrl - wxWindow *parent = GetParent()->GetParent(); + + // Send the event to wxDataViewCtrl itself. + wxWindow * const parent = GetParent(); wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId()); - cache_event.SetEventObject(GetParent()); + cache_event.SetEventObject(parent); cache_event.SetCache(item_start, item_last - 1); parent->ProcessWindowEvent(cache_event); @@ -1665,22 +1675,23 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetPen(m_penRule); dc.SetBrush(*wxTRANSPARENT_BRUSH); - int x = x_start; + // NB: Vertical rules are drawn in the last pixel of a column so that + // they align perfectly with native MSW wxHeaderCtrl as well as for + // consistency with MSW native list control. There's no vertical + // rule at the most-left side of the control. + + int x = x_start - 1; for (unsigned int i = col_start; i < col_last; i++) { wxDataViewColumn *col = GetOwner()->GetColumnAt(i); if (col->IsHidden()) continue; // skip it + x += col->GetWidth(); + dc.DrawLine(x, GetLineStart( item_start ), x, GetLineStart( item_last ) ); - - x += col->GetWidth(); } - - // Draw last vertical rule - dc.DrawLine(x, GetLineStart( item_start ), - x, GetLineStart( item_last ) ); } // redraw the background for the items which are selected/current @@ -2073,9 +2084,23 @@ 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 ) { - GetOwner()->InvalidateColBestWidth(col); + 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 @@ -2095,8 +2120,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; @@ -2154,6 +2179,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) @@ -2162,6 +2189,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; @@ -3612,19 +3641,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { const unsigned colIdx = col->GetModelColumn(); - wxVariant value; - model->GetValue( value, item, colIdx ); - - cell->WXOnActivate(model, value, item, colIdx); - - if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() ) - { - cell->SetValue( value ); + cell->PrepareForItem(model, item, colIdx); - wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); - custom->Activate( cell_rect, model, item, colIdx ); - } + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); + cell->WXOnActivate( cell_rect, model, item, colIdx ); } else { @@ -3795,53 +3816,50 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Call LeftClick after everything else as under GTK+ if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE) { - if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() ) - { - // notify cell about click - custom->PrepareForItem(model, item, col->GetModelColumn()); + // notify cell about click + cell->PrepareForItem(model, item, col->GetModelColumn()); - wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); - // Report position relative to the cell's custom area, i.e. - // no the entire space as given by the control but the one - // used by the renderer after calculation of alignment etc. + // Report position relative to the cell's custom area, i.e. + // no the entire space as given by the control but the one + // used by the renderer after calculation of alignment etc. - // adjust the rectangle ourselves to account for the alignment - wxRect rectItem = cell_rect; - const int align = custom->GetAlignment(); - if ( align != wxDVR_DEFAULT_ALIGNMENT ) - { - const wxSize size = custom->GetSize(); + // adjust the rectangle ourselves to account for the alignment + wxRect rectItem = cell_rect; + const int align = cell->GetAlignment(); + if ( align != wxDVR_DEFAULT_ALIGNMENT ) + { + const wxSize size = cell->GetSize(); - if ( size.x >= 0 && size.x < cell_rect.width ) - { - if ( align & wxALIGN_CENTER_HORIZONTAL ) - rectItem.x += (cell_rect.width - size.x)/2; - else if ( align & wxALIGN_RIGHT ) - rectItem.x += cell_rect.width - size.x; - // else: wxALIGN_LEFT is the default - } + if ( size.x >= 0 && size.x < cell_rect.width ) + { + if ( align & wxALIGN_CENTER_HORIZONTAL ) + rectItem.x += (cell_rect.width - size.x)/2; + else if ( align & wxALIGN_RIGHT ) + rectItem.x += cell_rect.width - size.x; + // else: wxALIGN_LEFT is the default + } - if ( size.y >= 0 && size.y < cell_rect.height ) - { - if ( align & wxALIGN_CENTER_VERTICAL ) - rectItem.y += (cell_rect.height - size.y)/2; - else if ( align & wxALIGN_BOTTOM ) - rectItem.y += cell_rect.height - size.y; - // else: wxALIGN_TOP is the default - } + if ( size.y >= 0 && size.y < cell_rect.height ) + { + if ( align & wxALIGN_CENTER_VERTICAL ) + rectItem.y += (cell_rect.height - size.y)/2; + else if ( align & wxALIGN_BOTTOM ) + rectItem.y += cell_rect.height - size.y; + // else: wxALIGN_TOP is the default } + } - wxPoint pos( event.GetPosition() ); - pos.x -= rectItem.x; - pos.y -= rectItem.y; + wxPoint pos( event.GetPosition() ); + pos.x -= rectItem.x; + pos.y -= rectItem.y; - m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y ); + m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y ); - /* ignore ret */ custom->LeftClick( pos, cell_rect, - model, item, col->GetModelColumn()); - } + /* ignore ret */ cell->WXOnLeftClick( pos, cell_rect, + model, item, col->GetModelColumn()); } } } @@ -4220,7 +4238,7 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const calculator.UpdateWithRow(row); } - // row is the first unmeasured item now; that's out value of N/2 + // row is the first unmeasured item now; that's our value of N/2 if ( row < count ) { @@ -4260,8 +4278,6 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const const_cast(this)->m_colsBestWidths[idx] = max_width; return max_width; - - #undef MEASURE_ITEM } void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), @@ -4309,8 +4325,9 @@ void wxDataViewCtrl::InvalidateColBestWidths() if ( m_headerArea ) { - // this updates visual appearance of columns 0 and up, not just 0 - m_headerArea->UpdateColumn(0); + const unsigned cols = m_headerArea->GetColumnCount(); + for ( unsigned i = 0; i < cols; i++ ) + m_headerArea->UpdateColumn(i); } } @@ -4616,7 +4633,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