Playtree: handle delete nicely

[vlc] / modules / gui / skins2 / controls / ctrl_tree.cpp

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index 384caa1e02cb2cdf882917524d89a7a0a9198786..86863a6c75a1ca115bc5161bb5556664bb75c524 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -61,7 +61,7 @@ CtrlTree::CtrlTree( intf_thread_t *pIntf,
     m_pOpenBitmap( pOpenBitmap ), m_pClosedBitmap( pClosedBitmap ),
     m_fgColor( fgColor ), m_playColor( playColor ), m_bgColor1( bgColor1 ),
     m_bgColor2( bgColor2 ), m_selColor( selColor ),
-    m_pLastSelected( NULL ), m_pImage( NULL )
+    m_pLastSelected( NULL ), m_pImage( NULL ), m_dontMove( false )
 {
     // Observe the tree and position variables
     m_rTree.addObserver( this );
@@ -150,7 +150,22 @@ void CtrlTree::onUpdate( Subject<VarTree, tree_update*> &rTree,
     }
     else if ( arg->i_type == 2 ) // Item-append
     {
-        /// \todo Check if the item is really visible in the view (we only check if it in the document)
+        /// \todo Check if the item is really visible in the view
+        // (we only check if it in the document)
+        if( arg->b_visible == true )
+        {
+            makeImage();
+        }
+    }
+    else if( arg->i_type == 3 ) // item-del
+    {
+        /* Make sure firstPos and lastSelected are still valid */
+        while( m_firstPos->m_deleted && m_firstPos != m_rTree.root()->begin() )
+        {
+            m_firstPos = m_rTree.getPrevVisibleItem( m_firstPos );
+        }
+        if( m_firstPos->m_deleted ) m_firstPos = m_rTree.root()->begin();
+
         if( arg->b_visible == true )
         {
             makeImage();
@@ -164,6 +179,8 @@ void CtrlTree::onUpdate( Subject<VarPercent, void*> &rPercent, void* arg)
     // Determine what is the first item to display
     VarTree::Iterator it = m_rTree.begin();
 
+    if( m_dontMove ) return;
+
     int excessItems = m_rTree.visibleItems() - maxItems();
 
     if( excessItems > 0)
@@ -214,6 +231,7 @@ void CtrlTree::onPositionChange()
 
 void CtrlTree::handleEvent( EvtGeneric &rEvent )
 {
+    bool bChangedPosition = false;
     VarTree::Iterator toShow; bool needShow = false;
     if( rEvent.getAsString().find( "key:down" ) != string::npos )
     {
@@ -229,7 +247,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         else if( key == KEY_PAGEDOWN )
         {
             it = m_firstPos;
-            int i = maxItems()*1.5;
+            int i = (int)(maxItems()*1.5);
             while( i >= 0 )
             {
                 VarTree::Iterator it_old = it;
@@ -333,6 +351,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
                     else
                     {
                         it->m_expanded = true;
+                        bChangedPosition = true;
                     }
                 }
             }
@@ -344,6 +363,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
                     if( it->m_expanded && it->size() )
                     {
                         it->m_expanded = false;
+                        bChangedPosition = true;
                     }
                     else
                     {
@@ -448,26 +468,30 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
                  string::npos )
         {
             it = findItemAtPos(yPos);
-            if( it->size() && xPos > (it->depth() - 1) * itemImageWidth()
-                && xPos < it->depth() * itemImageWidth() )
-            {
-                // Fold/unfold the item
-                it->m_expanded = !it->m_expanded;
-            }
-            else
+            if( it != m_rTree.end() )
             {
-                // Unselect any previously selected item
-                VarTree::Iterator it2;
-                for( it2 = m_rTree.begin(); it2 != m_rTree.end();
-                     it2 = m_rTree.getNextVisibleItem( it2 ) )
+                if( it->size() && xPos > (it->depth() - 1) * itemImageWidth()
+                    && xPos < it->depth() * itemImageWidth() )
                 {
-                    it2->m_selected = false;
+                    // Fold/unfold the item
+                    it->m_expanded = !it->m_expanded;
+                    bChangedPosition = true;
                 }
-                // Select the new item
-                if( it != m_rTree.end() )
+                else
                 {
-                    it->m_selected = true;
-                    m_pLastSelected = &*it;
+                    // Unselect any previously selected item
+                    VarTree::Iterator it2;
+                    for( it2 = m_rTree.begin(); it2 != m_rTree.end();
+                         it2 = m_rTree.getNextVisibleItem( it2 ) )
+                    {
+                        it2->m_selected = false;
+                    }
+                    // Select the new item
+                    if( it != m_rTree.end() )
+                    {
+                        it->m_selected = true;
+                        m_pLastSelected = &*it;
+                    }
                 }
             }
         }
@@ -503,6 +527,30 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         }
         m_rTree.getPositionVar().set( percentage );
     }
+
+    /* We changed the nodes, let's fix teh position var */
+    if( bChangedPosition )
+    {
+        VarTree::Iterator it;
+        int i = 0;
+        int iFirst = 0;
+        for( it = m_rTree.begin(); it != m_rTree.end();
+             it = m_rTree.getNextVisibleItem( it ) )
+        {
+            i++;
+            if( it == m_firstPos )
+            {
+                iFirst = i;
+                break;
+            }
+        }
+        iFirst += maxItems();
+        if( iFirst >= m_rTree.visibleItems() ) iFirst = m_rTree.visibleItems();
+        float f_new = (float)iFirst / (float)m_rTree.visibleItems();
+        m_dontMove = true;
+        m_rTree.getPositionVar().set( 1.0 - f_new );
+        m_dontMove = false;
+    }
 }
 
 bool CtrlTree::mouseOver( int x, int y ) const
@@ -636,7 +684,10 @@ void CtrlTree::makeImage()
                     m_pImage->fillRect( 0, yPos, width, rectHeight,
                                         m_selColor );
                 }
-                it = m_rTree.getNextVisibleItem( it );
+                do
+                {
+                    it = m_rTree.getNextVisibleItem( it );
+                } while( it->m_deleted );
             }
         }
     }
@@ -653,7 +704,10 @@ void CtrlTree::makeImage()
             {
                 uint32_t color = ( it->m_selected ? m_selColor : bgColor );
                 m_pImage->fillRect( 0, yPos, width, rectHeight, color );
-                it = m_rTree.getNextVisibleItem( it );
+                do
+                {
+                    it = m_rTree.getNextVisibleItem( it );
+                } while( it->m_deleted );
             }
             else
             {
@@ -716,9 +770,10 @@ void CtrlTree::makeImage()
             yPos += (pText->getHeight() - ySrc );
             delete pText;
         }
+        do {
         it = m_rTree.getNextVisibleItem( it );
+        } while( it->m_deleted );
     }
-    /// \todo Reposition percentage var to accomodate if it's not suitable anymore (if we expanded a node)
 }
 
 VarTree::Iterator CtrlTree::findItemAtPos( int pos )