Reposition the slider when expanding/retracting a node (Closes:#477)

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index 384caa1e02cb2cdf882917524d89a7a0a9198786..e7272b3960d5268fb6b48e67c88c4df465676af8 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_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 );
 {
     // Observe the tree and position variables
     m_rTree.addObserver( this );


@@ -164,6 +164,8 @@ void CtrlTree::onUpdate( Subject<VarPercent, void*> &rPercent, void* arg)
     // Determine what is the first item to display
     VarTree::Iterator it = m_rTree.begin();
 
     // 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)
     int excessItems = m_rTree.visibleItems() - maxItems();
 
     if( excessItems > 0)


@@ -214,6 +216,7 @@ void CtrlTree::onPositionChange()
 
 void CtrlTree::handleEvent( EvtGeneric &rEvent )
 {
 
 void CtrlTree::handleEvent( EvtGeneric &rEvent )
 {

+    bool bChangedPosition = false;

     VarTree::Iterator toShow; bool needShow = false;
     if( rEvent.getAsString().find( "key:down" ) != string::npos )
     {
     VarTree::Iterator toShow; bool needShow = false;
     if( rEvent.getAsString().find( "key:down" ) != string::npos )
     {


@@ -229,7 +232,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         else if( key == KEY_PAGEDOWN )
         {
             it = m_firstPos;
         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;
             while( i >= 0 )
             {
                 VarTree::Iterator it_old = it;


@@ -333,6 +336,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
                     else
                     {
                         it->m_expanded = true;
                     else
                     {
                         it->m_expanded = true;

+                        bChangedPosition = true;

                     }
                 }
             }
                     }
                 }
             }


@@ -344,6 +348,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
                     if( it->m_expanded && it->size() )
                     {
                         it->m_expanded = false;
                     if( it->m_expanded && it->size() )
                     {
                         it->m_expanded = false;

+                        bChangedPosition = true;

                     }
                     else
                     {
                     }
                     else
                     {


@@ -453,6 +458,7 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
             {
                 // Fold/unfold the item
                 it->m_expanded = !it->m_expanded;
             {
                 // Fold/unfold the item
                 it->m_expanded = !it->m_expanded;

+                bChangedPosition = true;

             }
             else
             {
             }
             else
             {


@@ -503,6 +509,30 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
         }
         m_rTree.getPositionVar().set( percentage );
     }
         }
         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
 }
 
 bool CtrlTree::mouseOver( int x, int y ) const


@@ -718,7 +748,6 @@ void CtrlTree::makeImage()
         }
         it = m_rTree.getNextVisibleItem( it );
     }
         }
         it = m_rTree.getNextVisibleItem( it );
     }

-    /// \todo Reposition percentage var to accomodate if it's not suitable anymore (if we expanded a node)

 }
 
 VarTree::Iterator CtrlTree::findItemAtPos( int pos )
 }
 
 VarTree::Iterator CtrlTree::findItemAtPos( int pos )

diff --git a/modules/gui/skins2/controls/ctrl_tree.hpp b/modules/gui/skins2/controls/ctrl_tree.hpp
index d690b2b51e92f8464d6cffa65ea81ae63bac2e71..dc5adf420d1507a28d9c6c4c621f810d64a3eda9 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.hpp
+++ b/modules/gui/skins2/controls/ctrl_tree.hpp
@@ -111,6 +111,9 @@ class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update*>,
         /// First item in the visible area
         VarTree::Iterator m_firstPos;
 
         /// First item in the visible area
         VarTree::Iterator m_firstPos;
 

+        /// Don't move if the position variable is updated
+        bool m_dontMove;
+

         /// Method called when the tree variable is modified
         virtual void onUpdate( Subject<VarTree, tree_update*> &rTree ,
                                tree_update *);
         /// Method called when the tree variable is modified
         virtual void onUpdate( Subject<VarTree, tree_update*> &rTree ,
                                tree_update *);