Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add drop hint

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-01-21 18:20:51 +00:00
parent a90280fe1a
commit 9deec11183
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/datavgen.cpp
View File

@@ -489,6 +489,7 @@ public:
bool EnableDragSource( const wxDataFormat &format ); bool EnableDragSource( const wxDataFormat &format );
bool EnableDropTarget( const wxDataFormat &format ); bool EnableDropTarget( const wxDataFormat &format );
void RemoveDropHint();
wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y ); bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y );
wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def );
@@ -529,6 +530,8 @@ private:
bool m_dropEnabled; bool m_dropEnabled;
wxDataFormat m_dropFormat; wxDataFormat m_dropFormat;
bool m_dropHint;
unsigned int m_dropHintLine;
// for double click logic // for double click logic
unsigned int m_lineLastClicked, unsigned int m_lineLastClicked,
@@ -1240,6 +1243,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
m_dragEnabled = false; m_dragEnabled = false;
m_dropEnabled = false; m_dropEnabled = false;
m_dropHint = false;
m_dropHintLine = (unsigned int) -1;
m_hasFocus = false; m_hasFocus = false;
@@ -1286,6 +1291,16 @@ bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format )
return true; 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 ) wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
{ {
int xx = x; int xx = x;
@@ -1294,7 +1309,10 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w
unsigned int row = GetLineAt( yy ); unsigned int row = GetLineAt( yy );
if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
{
RemoveDropHint();
return wxDragNone; return wxDragNone;
}
wxDataViewItem item = GetItemByRow( row ); wxDataViewItem item = GetItemByRow( row );
@@ -1306,16 +1324,31 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w
event.SetModel( model ); event.SetModel( model );
event.SetDataFormat( format ); event.SetDataFormat( format );
if (!m_owner->HandleWindowEvent( event )) if (!m_owner->HandleWindowEvent( event ))
{
RemoveDropHint();
return wxDragNone; return wxDragNone;
}
if (!event.IsAllowed()) if (!event.IsAllowed())
{
RemoveDropHint();
return wxDragNone; return wxDragNone;
}
if (m_dropHint && (row != m_dropHintLine))
RefreshRow( m_dropHintLine );
m_dropHint = true;
m_dropHintLine = row;
RefreshRow( row );
return def; return def;
} }
bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
{ {
RemoveDropHint();
int xx = x; int xx = x;
int yy = y; int yy = y;
m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
@@ -1376,6 +1409,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo
void wxDataViewMainWindow::OnLeave() void wxDataViewMainWindow::OnLeave()
{ {
RemoveDropHint();
} }
void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
@@ -1496,6 +1530,14 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
} }
} }
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 );
}
wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
if (!expander) if (!expander)
{ {