More state saving

Author: Neverbirth

External/3rdParty/Aga-1.7/Aga.Controls/Tree/TreeViewAdv.Properties.cs

@@ -130,7 +130,7 @@ internal Point ItemDragStart
 		/// <summary>
 		/// Number of rows fits to the current page
 		/// </summary>
-		internal int CurrentPageSize
+		public int CurrentPageSize
 		{
 			get
 			{
@@ -170,6 +170,27 @@ internal int FirstVisibleRow
 			}
 		}
 
+	    public TreeNodeAdv FirstVisibleNode
+	    {
+	        get
+	        {
+	            if (_firstVisibleRow >= 0 && _firstVisibleRow < RowMap.Count)
+	                return RowMap[_firstVisibleRow];
+                return null;
+	        }
+	    }
+
+	    public TreeNodeAdv LastVisibleNode
+	    {
+	        get
+	        {
+	            int lastVisibleRow = _firstVisibleRow + CurrentPageSize - 1;
+	            if (lastVisibleRow >= 0 && lastVisibleRow < RowMap.Count)
+	                return RowMap[lastVisibleRow];
+                return null;
+	        }
+	    }
+
 		private int _offsetX;
 		public int OffsetX
 		{

External/Plugins/FlashDebugger/Controls/DataTreeControl.cs

@@ -75,17 +75,18 @@ public DataTreeControl(bool watchMode)
 
             _model = new DataTreeModel();
             _tree.Model = _model;
+            _tree.FullRowSelect = true;
             Controls.Add(_tree);
             _tree.Expanding += TreeExpanding;
             _tree.SelectionChanged += TreeSelectionChanged;
+            _tree.NodeMouseDoubleClick += Tree_NodeMouseDoubleClick;
             _tree.LoadOnDemand = true;
             _tree.AutoRowHeight = true;
             ValueNodeTextBox.DrawText += ValueNodeTextBox_DrawText;
             ValueNodeTextBox.IsEditEnabledValueNeeded += ValueNodeTextBox_IsEditEnabledValueNeeded;
             ValueNodeTextBox.EditorShowing += ValueNodeTextBox_EditorShowing;
             ValueNodeTextBox.EditorHided += ValueNodeTextBox_EditorHided;
             ValueNodeTextBox.LabelChanged += ValueNodeTextBox_LabelChanged;
-            _tree.NodeMouseDoubleClick += Tree_NodeMouseDoubleClick;
             _contextMenuStrip = new ContextMenuStrip();
             if (PluginBase.MainForm != null && PluginBase.Settings != null)
             {
@@ -478,6 +479,7 @@ public void SaveState()
             state.Selected = _tree.SelectedNode == null ? null : _model.GetFullPath(_tree.SelectedNode.Tag as Node);
             state.Expanded.Clear();
             SaveExpanded(Nodes);
+            SaveScrollState();
         }
 
         private void SaveExpanded(Collection<Node> nodes)
@@ -493,12 +495,26 @@ private void SaveExpanded(Collection<Node> nodes)
             }
         }
 
+        private void SaveScrollState()
+        {
+            if (Nodes.Count < 1)
+            {
+                state.TopPath = state.BottomPath = null;
+                return;
+            }
+            var topNode = _tree.FirstVisibleNode;
+            state.TopPath = topNode != null ? _model.GetFullPath(_tree.FirstVisibleNode.Tag as Node) : null;
+            var bottomNode = _tree.LastVisibleNode;
+            state.BottomPath = bottomNode != null ? _model.GetFullPath(bottomNode.Tag as Node) : null;
+        }
+
         public void RestoreState()
         {
             if (state == null) return;
             RestoreExpanded(Nodes);
             if (state.Selected != null)
                 _tree.SelectedNode = _tree.FindNodeByTag(_model.FindNode(state.Selected));
+            RestoreScrollState();
         }
 
         private void RestoreExpanded(Collection<Node> nodes)
@@ -514,6 +530,22 @@ private void RestoreExpanded(Collection<Node> nodes)
             }
         }
 
+        private void RestoreScrollState()
+        {
+            if (Nodes.Count < 1) return;
+
+            if (state.BottomPath != null)
+            {
+                var bottomNode = Tree.FindNodeByTag(_model.FindNode(state.BottomPath));
+                if (bottomNode != null) Tree.EnsureVisible(bottomNode);
+            }
+
+            if (state.TopPath != null)
+            {
+                var topNode = Tree.FindNodeByTag(_model.FindNode(state.TopPath));
+                if (topNode != null) Tree.EnsureVisible(topNode);
+            }
+        }
 
         #region IToolTipProvider Members
 
@@ -545,7 +577,8 @@ private class DataTreeState
 
             public HashSet<string> Expanded = new HashSet<String>();
             public string Selected;
-
+            public string TopPath;
+            public string BottomPath;
         }
 
         #endregion

External/Plugins/FlashDebugger/Controls/DataTreeModel.cs

@@ -31,6 +31,7 @@ private Node FindNode(Node root, string path)
         {
             foreach (Node node in root.Nodes)
             {
+                // TODO: We could optimize some more here, we don't need to get the full path
                 string nodePath = GetFullPath(node);
                 if (path == nodePath) return node;
                 if (path.StartsWith(nodePath))