X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7fe42e848cc0c9058dae906c3a7bded50681e6..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index a23a0a3549..d90cd83ef0 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3,7 +3,6 @@ // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -284,7 +283,7 @@ private: void OnRClick(wxHeaderCtrlEvent& event) { - if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED, + if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, event.GetColumn()) ) event.Skip(); } @@ -1090,7 +1089,7 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& cellRect, +bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect), wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, @@ -1100,18 +1099,7 @@ bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& cellRect, { // Only react to clicks directly on the checkbox, not elsewhere in the // same cell. - // - // We suppose that the checkbox is centred in the total cell rectangle - // as this is how it's rendered, at least under MSW. If this turns out - // to be a wrong assumption, we probably would need to do the hit test - // checking in wxRendererNative but for now this simple solution works. - wxRect checkRect = wxRect(GetSize()).CentreIn(cellRect); - - // After centering in cellRect, we need to pull it back to (0, 0) as - // the mouse coordinates passed to us are relative to cellRect already. - checkRect.Offset(-cellRect.GetPosition()); - - if ( !checkRect.Contains(mouseEvent->GetPosition()) ) + if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) ) return false; } @@ -4073,6 +4061,58 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } +#if wxUSE_DRAG_AND_DROP + if (event.Dragging() || ((m_dragCount > 0) && event.Leaving())) + { + if (m_dragCount == 0) + { + // we have to report the raw, physical coords as we want to be + // able to call HitTest(event.m_pointDrag) from the user code to + // get the item being dragged + m_dragStart = event.GetPosition(); + } + + m_dragCount++; + if ((m_dragCount < 3) && (event.Leaving())) + m_dragCount = 3; + else if (m_dragCount != 3) + return; + + if (event.LeftIsDown()) + { + m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, + &m_dragStart.x, &m_dragStart.y ); + unsigned int drag_item_row = GetLineAt( m_dragStart.y ); + wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); + + // Notify cell about drag + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( itemDragged ); + event.SetModel( model ); + if (!m_owner->HandleWindowEvent( event )) + return; + + if (!event.IsAllowed()) + return; + + wxDataObject *obj = event.GetDataObject(); + if (!obj) + return; + + wxDataViewDropSource drag( this, drag_item_row ); + drag.SetData( *obj ); + /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags()); + delete obj; + } + return; + } + else + { + m_dragCount = 0; + } +#endif // wxUSE_DRAG_AND_DROP + // Check if we clicked outside the item area. if ((current >= GetRowCount()) || !col) { @@ -4146,57 +4186,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } } -#if wxUSE_DRAG_AND_DROP - if (event.Dragging()) - { - if (m_dragCount == 0) - { - // we have to report the raw, physical coords as we want to be - // able to call HitTest(event.m_pointDrag) from the user code to - // get the item being dragged - m_dragStart = event.GetPosition(); - } - - m_dragCount++; - - if (m_dragCount != 3) - return; - - if (event.LeftIsDown()) - { - m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, - &m_dragStart.x, &m_dragStart.y ); - unsigned int drag_item_row = GetLineAt( m_dragStart.y ); - wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); - - // Notify cell about drag - wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( itemDragged ); - event.SetModel( model ); - if (!m_owner->HandleWindowEvent( event )) - return; - - if (!event.IsAllowed()) - return; - - wxDataObject *obj = event.GetDataObject(); - if (!obj) - return; - - wxDataViewDropSource drag( this, drag_item_row ); - drag.SetData( *obj ); - /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags()); - delete obj; - } - return; - } - else - { - m_dragCount = 0; - } -#endif // wxUSE_DRAG_AND_DROP - bool simulateClick = false; if (event.ButtonDClick()) @@ -4390,33 +4379,38 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) 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 + // not the entire space as given by the control but the one // used by the renderer after calculation of alignment etc. + // + // Notice that this results in negative coordinates when clicking + // in the upper left corner of a centre-aligned cell which doesn't + // fill its column entirely so this is somewhat surprising, but we + // do it like this for compatibility with the native GTK+ version, + // see #12270. // adjust the rectangle ourselves to account for the alignment + int align = cell->GetAlignment(); + if ( align == wxDVR_DEFAULT_ALIGNMENT ) + align = wxALIGN_CENTRE; + 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 ) { - 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 ( 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 } wxMouseEvent event2(event);