Add drop hint

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 44638e2aef947c238fe5edb30637f447e57aa67e..14e1357aeeaf64c9990f165c812e5232f4688ede 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -489,6 +489,7 @@ public:
     bool EnableDragSource( const wxDataFormat &format );
     bool EnableDropTarget( const wxDataFormat &format );
 
     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 );
     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 );


@@ -529,6 +530,8 @@ private:
     
     bool                        m_dropEnabled;
     wxDataFormat                m_dropFormat;
     
     bool                        m_dropEnabled;
     wxDataFormat                m_dropFormat;

+    bool                        m_dropHint;
+    unsigned int                m_dropHintLine;

 
     // for double click logic
     unsigned int m_lineLastClicked,
 
     // for double click logic
     unsigned int m_lineLastClicked,


@@ -1240,6 +1243,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_dragEnabled = false;
     m_dropEnabled = false;
 
     m_dragEnabled = 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 )
 {
     int xx = x;
 wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def )
 {
     int xx = x;


@@ -1294,7 +1309,10 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, w
     unsigned int row = GetLineAt( yy );
 
     if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
     unsigned int row = GetLineAt( yy );
 
     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.SetDataFormat( format );
     if (!m_owner->HandleWindowEvent( event ))
     event.SetModel( model );
     event.SetDataFormat( format );
     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;
 }
 
 bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
 {
     
     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 );
     int xx = x;
     int yy = y;
     m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );


@@ -1338,7 +1371,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y )
 
     if (!event.IsAllowed())
         return false;
 
     if (!event.IsAllowed())
         return false;

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -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) )


@@ -1495,6 +1529,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();
     if (!expander)
 
     wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
     if (!expander)