Restore document scroll state also...

Meychi · Meychi · commit f6a2727431b6 · 2016-03-31T15:53:07.000+03:00
diff --git a/FlashDevelop/Managers/FileStateManager.cs b/FlashDevelop/Managers/FileStateManager.cs
@@ -123,6 +123,7 @@ private static void ApplyStateObject(ScintillaControl sci, StateObject so, Boole
             }
             if (restorePosition)
             {
+                sci.FirstVisibleLine = so.LineScroll;
                 Int32 line = sci.LineFromPosition(so.Position);
                 sci.SetSel(so.Position, so.Position);
                 sci.EnsureVisible(line);
@@ -138,6 +139,7 @@ private static StateObject GetStateObject(ScintillaControl sci)
             so.LineCount = sci.LineCount;
             so.Position = sci.CurrentPos;
             so.FileName = sci.FileName;
+            so.LineScroll = sci.FirstVisibleLine;
             for (Int32 line = 0;; line++)
             {
                 Int32 lineNext = sci.ContractedFoldNext(line);
@@ -168,6 +170,7 @@ public class StateObject
     {
         public Int32 Position = 0;
         public Int32 LineCount = 0;
+        public Int32 LineScroll = 0;
         public String FileName = String.Empty;
         public List<Int32> BookmarkedLines = new List<Int32>();
         public List<Int32> FoldedLines = new List<Int32>();

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ private static void ApplyStateObject(ScintillaControl sci, StateObject so, Boole`
`123`	`123`	`}`
`124`	`124`	`if (restorePosition)`
`125`	`125`	`{`
	`126`	`+ sci.FirstVisibleLine = so.LineScroll;`
`126`	`127`	`Int32 line = sci.LineFromPosition(so.Position);`
`127`	`128`	`sci.SetSel(so.Position, so.Position);`
`128`	`129`	`sci.EnsureVisible(line);`
`@@ -138,6 +139,7 @@ private static StateObject GetStateObject(ScintillaControl sci)`
`138`	`139`	`so.LineCount = sci.LineCount;`
`139`	`140`	`so.Position = sci.CurrentPos;`
`140`	`141`	`so.FileName = sci.FileName;`
	`142`	`+ so.LineScroll = sci.FirstVisibleLine;`
`141`	`143`	`for (Int32 line = 0;; line++)`
`142`	`144`	`{`
`143`	`145`	`Int32 lineNext = sci.ContractedFoldNext(line);`
`@@ -168,6 +170,7 @@ public class StateObject`
`168`	`170`	`{`
`169`	`171`	`public Int32 Position = 0;`
`170`	`172`	`public Int32 LineCount = 0;`
	`173`	`+ public Int32 LineScroll = 0;`
`171`	`174`	`public String FileName = String.Empty;`
`172`	`175`	`public List<Int32> BookmarkedLines = new List<Int32>();`
`173`	`176`	`public List<Int32> FoldedLines = new List<Int32>();`