X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a653c966d4dfdb2e0b404ed7991c9c1abf0dcada..02b51ae521db06ef12a3c2a37a5378a9f715e707:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 44638e2aef..4e07612000 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -34,6 +34,7 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/dcscreen.h" + #include "wx/frame.h" #endif #include "wx/stockitem.h" @@ -416,6 +417,9 @@ public: wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } +#if wxUSE_DRAG_AND_DROP + wxBitmap CreateItemBitmap( unsigned int row, int &indent ); +#endif // wxUSE_DRAG_AND_DROP void OnPaint( wxPaintEvent &event ); void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); void OnChar( wxKeyEvent &event ); @@ -486,13 +490,16 @@ public: void Collapse( unsigned int row ) { OnCollapsing( row ); } bool IsExpanded( unsigned int row ) const; +#if wxUSE_DRAG_AND_DROP bool EnableDragSource( const wxDataFormat &format ); bool EnableDropTarget( const wxDataFormat &format ); + void RemoveDropHint(); wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y ); wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); void OnLeave(); +#endif // wxUSE_DRAG_AND_DROP private: wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; @@ -521,14 +528,18 @@ private: bool m_hasFocus; +#if wxUSE_DRAG_AND_DROP int m_dragCount; wxPoint m_dragStart; - + bool m_dragEnabled; wxDataFormat m_dragFormat; - + bool m_dropEnabled; wxDataFormat m_dropFormat; + bool m_dropHint; + unsigned int m_dropHintLine; +#endif // wxUSE_DRAG_AND_DROP // for double click logic unsigned int m_lineLastClicked, @@ -1135,6 +1146,85 @@ wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), // wxDataViewDropTarget //----------------------------------------------------------------------------- +#if wxUSE_DRAG_AND_DROP + +class wxBitmapCanvas: public wxWindow +{ +public: + wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) : + wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) + { + m_bitmap = bitmap; + Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); + } + + void OnPaint( wxPaintEvent &WXUNUSED(event) ) + { + wxPaintDC dc(this); + dc.DrawBitmap( m_bitmap, 0, 0); + } + + wxBitmap m_bitmap; +}; + +class wxDataViewDropSource: public wxDropSource +{ +public: + wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : + wxDropSource( win ) + { + m_win = win; + m_row = row; + m_hint = NULL; + } + + ~wxDataViewDropSource() + { + delete m_hint; + } + + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) + { + wxPoint pos = wxGetMousePosition(); + + if (!m_hint) + { + int liney = m_win->GetLineStart( m_row ); + int linex = 0; + m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney ); + m_win->ClientToScreen( &linex, &liney ); + m_dist_x = pos.x - linex; + m_dist_y = pos.y - liney; + + int indent = 0; + 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 ); + new wxBitmapCanvas( m_hint, ib, ib.GetSize() ); + m_hint->Show(); + } + else + { + m_hint->Move( pos.x - m_dist_x, pos.y + 5 ); + m_hint->SetTransparent( 128 ); + } + + return false; + } + + wxDataViewMainWindow *m_win; + unsigned int m_row; + wxFrame *m_hint; + int m_dist_x,m_dist_y; +}; + + class wxDataViewDropTarget: public wxDropTarget { public: @@ -1145,23 +1235,23 @@ 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); + 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 ); + 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; @@ -1169,13 +1259,15 @@ public: return wxDragNone; return m_win->OnData( format, x, y, def ); } - + virtual void OnLeave() { m_win->OnLeave(); } wxDataViewMainWindow *m_win; }; +#endif // wxUSE_DRAG_AND_DROP + //----------------------------------------------------------------------------- // wxDataViewRenameTimer //----------------------------------------------------------------------------- @@ -1232,14 +1324,19 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 +#if wxUSE_DRAG_AND_DROP m_dragCount = 0; m_dragStart = wxPoint(0,0); - m_lineLastClicked = (unsigned int) -1; - m_lineBeforeLastClicked = (unsigned int) -1; - m_lineSelectSingleOnUp = (unsigned int) -1; m_dragEnabled = false; m_dropEnabled = false; + m_dropHint = false; + m_dropHintLine = (unsigned int) -1; +#endif // wxUSE_DRAG_AND_DROP + + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; m_hasFocus = false; @@ -1267,25 +1364,37 @@ wxDataViewMainWindow::~wxDataViewMainWindow() delete m_renameTimer; } + +#if wxUSE_DRAG_AND_DROP bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) { m_dragFormat = format; m_dragEnabled = format != wxDF_INVALID; - + return true; } - + bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) { m_dropFormat = format; m_dropEnabled = format != wxDF_INVALID; - + if (m_dropEnabled) SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) ); - + return true; } +void wxDataViewMainWindow::RemoveDropHint() +{ + if (m_dropHint) + { + m_dropHint = false; + RefreshRow( m_dropHintLine ); + m_dropHintLine = (unsigned int) -1; + } +} + wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ) { int xx = x; @@ -1294,28 +1403,46 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w unsigned int row = GetLineAt( yy ); if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + { + RemoveDropHint(); return wxDragNone; + } wxDataViewItem item = GetItemByRow( row ); - + wxDataViewModel *model = GetOwner()->GetModel(); - + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( model ); event.SetDataFormat( format ); if (!m_owner->HandleWindowEvent( event )) + { + RemoveDropHint(); return wxDragNone; + } if (!event.IsAllowed()) + { + RemoveDropHint(); return wxDragNone; - + } + + + if (m_dropHint && (row != m_dropHintLine)) + RefreshRow( m_dropHintLine ); + m_dropHint = true; + m_dropHintLine = row; + RefreshRow( row ); + return def; } bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) { + RemoveDropHint(); + int xx = x; int yy = y; m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); @@ -1325,9 +1452,9 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) return false; wxDataViewItem item = GetItemByRow( row ); - + wxDataViewModel *model = GetOwner()->GetModel(); - + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); @@ -1338,7 +1465,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) if (!event.IsAllowed()) return false; - + return true; } @@ -1353,9 +1480,9 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo return wxDragNone; wxDataViewItem item = GetItemByRow( row ); - + wxDataViewModel *model = GetOwner()->GetModel(); - + wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() ); @@ -1376,8 +1503,117 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo void wxDataViewMainWindow::OnLeave() { + RemoveDropHint(); } +wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) +{ + int height = GetLineHeight( row ); + int width = 0; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) + { + wxDataViewColumn *column = GetOwner()->GetColumnAt(col); + if (column->IsHidden()) + continue; // skip it! + width += column->GetWidth(); + } + + indent = 0; + if (!IsVirtualList()) + { + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space + } + width -= indent; + + wxBitmap bitmap( width, height ); + wxMemoryDC dc( bitmap ); + dc.SetFont( GetFont() ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 0,0,width,height ); + + wxDataViewModel *model = m_owner->GetModel(); + + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) + { + // TODO-RTL: last column for RTL support + expander = GetOwner()->GetColumnAt( 0 ); + GetOwner()->SetExpanderColumn(expander); + } + + + int x = 0; + for (col = 0; col < cols; col++) + { + wxDataViewColumn *column = GetOwner()->GetColumnAt( col ); + wxDataViewRenderer *cell = column->GetRenderer(); + + if (column->IsHidden()) + continue; // skip it! + + width = column->GetWidth(); + + if (column == expander) + width -= indent; + + wxVariant value; + wxDataViewItem item = GetItemByRow( row ); + model->GetValue( value, item, column->GetModelColumn()); + cell->SetValue( value ); + + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( item, column->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } + + wxSize size = cell->GetSize(); + size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width ); + size.y = height; + wxRect item_rect(x, 0, size.x, size.y); + + int align = cell->CalculateAlignment(); + // horizontal alignment: + item_rect.x = x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = x + (width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = x + width - size.x; + //else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = 0; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = (height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = height - size.y; + //else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + //dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, 0 ); + //dc.DestroyClippingRegion(); + + x += width; + } + + return bitmap; +} + +#endif // wxUSE_DRAG_AND_DROP + + void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxDataViewModel *model = GetOwner()->GetModel(); @@ -1496,6 +1732,17 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } +#if wxUSE_DRAG_AND_DROP + if (m_dropHint) + { + wxRect rect( x_start, GetLineStart( m_dropHintLine ), + x_last, GetLineHeight( m_dropHintLine ) ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); + } +#endif // wxUSE_DRAG_AND_DROP + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); if (!expander) { @@ -2592,17 +2839,17 @@ bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const { if (IsVirtualList()) return false; - + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if (!node) return false; - + if (!node->HasChildren()) { delete node; return false; } - + return node->IsOpen(); } @@ -2694,7 +2941,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item wxDataViewModel * model = GetOwner()->GetModel(); if( model == NULL ) return NULL; - + if (!item.IsOk()) return m_root; @@ -2898,7 +3145,7 @@ static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wx wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); - + unsigned int index = 0; while( index < num ) { @@ -3139,6 +3386,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewModel *model = GetOwner()->GetModel(); +#if wxUSE_DRAG_AND_DROP if (event.Dragging()) { if (m_dragCount == 0) @@ -3167,19 +3415,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) event.SetModel( model ); if (!m_owner->HandleWindowEvent( event )) return; - + if (!event.IsAllowed()) return; - + wxDataObject *obj = event.GetDataObject(); if (!obj) return; - - wxDropSource drag( m_owner ); + + wxDataViewDropSource drag( this, drag_item_row ); drag.SetData( *obj ); - // wxImage image( 80, 20 ); - // wxBitmap bitmap( image ); - wxDragResult res = drag.DoDragDrop(); + /* wxDragResult res = */ drag.DoDragDrop(); delete obj; } return; @@ -3188,6 +3434,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { m_dragCount = 0; } +#endif // wxUSE_DRAG_AND_DROP bool forceClick = false; @@ -3467,8 +3714,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - if ( (style & wxBORDER_MASK) == 0) - style |= wxBORDER_SUNKEN; +// if ( (style & wxBORDER_MASK) == 0) +// style |= wxBORDER_SUNKEN; Init(); @@ -3500,6 +3747,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return true; } +wxBorder wxDataViewCtrl::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + #ifdef __WXMSW__ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, @@ -3566,6 +3818,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) return true; } +#if wxUSE_DRAG_AND_DROP + bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) { return m_clientArea->EnableDragSource( format ); @@ -3576,6 +3830,8 @@ bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) return m_clientArea->EnableDropTarget( format ); } +#endif // wxUSE_DRAG_AND_DROP + bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) @@ -3753,20 +4009,20 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) if (parent != last_parent) ExpandAncestors(item); } - + last_parent = parent; int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) selection.Add( static_cast(row) ); } - + m_clientArea->SetSelections( selection ); } void wxDataViewCtrl::Select( const wxDataViewItem & item ) { ExpandAncestors( item ); - + int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) { @@ -3891,7 +4147,7 @@ void wxDataViewCtrl::EnsureVisible( int row, int column ) void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) { ExpandAncestors( item ); - + m_clientArea->RecalculateDisplay(); int row = m_clientArea->GetRowByItem(item);