Added positioning of menubar when collapsing nodes.

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@19 e10066b5-e1e2-0310-b819-94efdf66514b

2 files changed, 19 insertions, 22 deletions

diff --git a/vdr_menu.c b/vdr_menu.c
index 39d2afe..699af2c 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -2,12 +2,15 @@
 /*! \file   vdr_menu.c
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.2 $
- * \date    $Date: 2004/02/02 19:17:44 $
+ * \version $Revision: 1.3 $
+ * \date    $Date: 2004/02/02 19:42:37 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  *
  * $Log: vdr_menu.c,v $
+ * Revision 1.3  2004/02/02 19:42:37  LarsAC
+ * Added positioning of menubar when collapsing nodes.
+ *
  * Revision 1.2  2004/02/02 19:17:44  LarsAC
  * Added generic filter handling to OSD
  *
@@ -53,16 +56,6 @@ void mgMenuTreeItem::Set()
   SetText( buffer, false );  
 }
 
-void mgMenuTreeItem::setChildIndex( int index )
-{
-  m_child_index = index;
-}
-
-int mgMenuTreeItem::getChildIndex( )
-{
-  return m_child_index;
-}
-
 // ----------------------- mgMenuTrackItem ------------------
 
 
@@ -264,7 +257,7 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	      {
 		mgDebug( 1,  "mgMainMenu: switch to filter" );
 
-		m_indices.push_back( Current() );
+		m_history.push_back( Current() );
 
 		mgSelectionTreeNode *child = CurrentNode();		
 		DisplayTree( child );
@@ -339,8 +332,8 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	      DisplayTree( parent );
 
 	      // restore last selected entry
-	      cOsdItem *item = Get( m_indices.back() );
-	      m_indices.pop_back();
+	      cOsdItem *item = Get( m_history.back() );
+	      m_history.pop_back();
 	      SetCurrent( item );
 	    }
 	  state = osContinue;
@@ -491,6 +484,11 @@ void mgMainMenu::DisplayAlbumInfo()
 void mgMainMenu::DisplayTree( mgSelectionTreeNode* node )
 {
   m_state = TREE;
+
+  if( node == m_root )
+    {
+      m_history.clear();
+    }
   
   if( node->expand( ) )
     {
diff --git a/vdr_menu.h b/vdr_menu.h
index a4bfed4..36e3bb3 100644
--- a/vdr_menu.h
+++ b/vdr_menu.h
@@ -2,12 +2,15 @@
 /*! \file   vdr_menu.h
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.3 $
- * \date    $Date: 2004/02/02 19:17:44 $
+ * \version $Revision: 1.4 $
+ * \date    $Date: 2004/02/02 19:42:37 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  *
  * $Log: vdr_menu.h,v $
+ * Revision 1.4  2004/02/02 19:42:37  LarsAC
+ * Added positioning of menubar when collapsing nodes.
+ *
  * Revision 1.3  2004/02/02 19:17:44  LarsAC
  * Added generic filter handling to OSD
  *
@@ -43,13 +46,9 @@ class mgMenuTreeItem : public cOsdItem
 
   void Set();
 
-  void setChildIndex( int index );
-  int  getChildIndex( );
-  
  private: 
 
   mgSelectionTreeNode *m_node;
-  int m_child_index;
 
 };
 
@@ -102,7 +101,7 @@ class mgMainMenu : public cOsdMenu
 
   MuggleStatus m_state;
 
-  std::list<int> m_indices;
+  std::list<int> m_history;
 };
 
 #endif