fix go to end when app log exceeds max size

digao-dalpiaz · Jul 29, 2023 · b49a918 · b49a918
1 parent 1538446
commit b49a918
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/DigaoDeskApp/Apps/DigaoApplication.cs b/DigaoDeskApp/Apps/DigaoApplication.cs
@@ -126,6 +126,7 @@ public class LogRecord
         {
             public DateTime Timestamp;
             public string Text;
+            public int Size;
             public LogType Type;
         }
 
@@ -326,6 +327,7 @@ private void AddLog(string text, bool error, bool stop = false)
             LogRecord r = new();
             r.Timestamp = DateTime.Now;
             r.Text = text;
+            r.Size = text.Length + Environment.NewLine.Length;
             if (stop)
             {
                 r.Type = LogType.STOP;
@@ -343,11 +345,11 @@ private void AddLog(string text, bool error, bool stop = false)
                 r.Type = LogType.INFO;
             }
             Logs.Add(r);
-            Interlocked.Add(ref _logSize, text.Length);
+            Interlocked.Add(ref _logSize, r.Size);
 
             while (Logs.Count>1 && _logSize > Vars.Config.Apps.MaxLogSize)
             {
-                Interlocked.Add(ref _logSize, -Logs[0].Text.Length);
+                Interlocked.Add(ref _logSize, -Logs[0].Size);
                 Logs.RemoveAt(0);
             }
 

diff --git a/DigaoDeskApp/Apps/FrmApps.cs b/DigaoDeskApp/Apps/FrmApps.cs
@@ -375,6 +375,8 @@ private void AddRemainingLog(DigaoApplication app)
                     edLog.SelectionStart = 0;
                     edLog.SelectionLength = edLog.TextLength - Vars.Config.Apps.MaxLogSize;
                     edLog.SelectedText = "[...]";
+
+                    edLog.SelectionStart = edLog.TextLength;
                 }
             }
             finally

diff --git a/DigaoDeskApp/Controls/RichTextBoxEx.cs b/DigaoDeskApp/Controls/RichTextBoxEx.cs
@@ -31,11 +31,15 @@ public void SuspendPainting()
         {
             if (_Painting)
             {
+                //--save position
                 _SuspendIndex = this.SelectionStart;
                 _SuspendLength = this.SelectionLength;
                 SendMessage(this.Handle, EM_GETSCROLLPOS, 0, ref _ScrollPoint);
+                //--
+
                 SendMessage(this.Handle, WM_SETREDRAW, 0, IntPtr.Zero);
                 _EventMask = SendMessage(this.Handle, EM_GETEVENTMASK, 0, IntPtr.Zero); // Stop sending of events
+
                 _Painting = false;
             }
         }
@@ -49,8 +53,10 @@ public void ResumePainting(bool restorePosition)
                     this.Select(_SuspendIndex, _SuspendLength);
                     SendMessage(this.Handle, EM_SETSCROLLPOS, 0, ref _ScrollPoint);
                 }
+
                 SendMessage(this.Handle, EM_SETEVENTMASK, 0, _EventMask); // turn on events
                 SendMessage(this.Handle, WM_SETREDRAW, 1, IntPtr.Zero);
+
                 _Painting = true;
                 this.Invalidate();
             }

diff --git a/DigaoDeskApp/Vars.cs b/DigaoDeskApp/Vars.cs
@@ -5,7 +5,7 @@ namespace DigaoDeskApp
     class Vars
     {
 
-        public const string APP_VERSION = "1.10.5";
+        public const string APP_VERSION = "1.10.6";
         public const string APP_REGKEY = @"SOFTWARE\DigaoDesk";
 
         public const string GITHUB_LINK = "https://github.com/digao-dalpiaz/DigaoDesk";