[vlc-commits] skins2: drag&drop (small tweak)

[Erwan Tulou]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Mon Jun  6 23:21:10 2011 +0200| [490745a0c58d5d86de1beb0736c642e751b688c4] | committer: Erwan Tulou

skins2: drag&drop (small tweak)

Rather than automatically expanding folders when hoving over them, use this
information (folder expanded or not) to either insert the dropped item as its
next sibling in the parent folder or as its first child in this folder respectively.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=490745a0c58d5d86de1beb0736c642e751b688c4
---

 modules/gui/skins2/controls/ctrl_tree.cpp |    2 --
 modules/gui/skins2/vars/playtree.cpp      |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index f86ac4b..32a90db 100644
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -504,8 +504,6 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         Iterator it = findItemAtPos( yPos );
         if( it != m_itOver )
         {
-            if( it != m_rTree.end() )
-                it->setExpanded( true );
             m_itOver = it;
             needRefresh = true;
         }
diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 89d2900..ce529eb 100644
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -290,7 +290,7 @@ void Playtree::insertItems( VarTree& elem, const list<string>& files, bool start
         p_node = m_pPlaylist->p_ml_category;
         i_pos = 0;
     }
-    else if( p_elem->size() )
+    else if( p_elem->size() && p_elem->isExpanded() )
     {
         p_node = playlist_ItemGetById( m_pPlaylist, p_elem->getId() );
         i_pos = 0;