Compare commits

..
4 Commits
Author SHA1 Message Date
kislovdm 24f8aefefa откат
.NET Core Desktop / build (Debug) (push) Has been cancelled
2026-07-23 16:52:40 +03:00
kislovdm 07af80d3ae откат 2026-07-23 16:52:32 +03:00
kislovdm 8dd0470bcf откат 2026-07-23 16:52:21 +03:00
kislovdm dc878569ad откат 2026-07-23 16:51:47 +03:00
3 changed files with 8 additions and 19 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.23
1.0.26
+4 -4
View File
@@ -6,10 +6,10 @@
<LangVersion>7.3</LangVersion>
<RootNamespace>MonsterMonitor</RootNamespace>
<AssemblyName>devenv</AssemblyName>
<AssemblyVersion>1.0.23</AssemblyVersion>
<Version>1.0.23</Version>
<FileVersion>1.0.23</FileVersion>
<InformationalVersion>1.0.23</InformationalVersion>
<AssemblyVersion>1.0.26</AssemblyVersion>
<Version>1.0.26</Version>
<FileVersion>1.0.26</FileVersion>
<InformationalVersion>1.0.26</InformationalVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Costura.Fody" Version="6.0.0">
+3 -14
View File
@@ -1,11 +1,10 @@
using MonsterMonitor.Models;
using MonsterMonitor.Services;
using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
using static System.Net.Mime.MediaTypeNames;
using MonsterMonitor.Models;
using MonsterMonitor.Services;
namespace MonsterMonitor.UI
{
@@ -30,7 +29,7 @@ namespace MonsterMonitor.UI
public MainForm()
{
Text = string.Format("Monster Monitor v{0}", System.Windows.Forms.Application.ProductVersion);
Text = string.Format("Monster Monitor v{0}", Application.ProductVersion);
Width = 980;
Height = 620;
StartPosition = FormStartPosition.CenterScreen;
@@ -191,18 +190,11 @@ namespace MonsterMonitor.UI
private void AppendLog(LogEntry entry)
{
if (_console.Text.Length > 100000)
{
_console.ResetText();
}
System.Windows.Forms.Application.DoEvents();
if (InvokeRequired)
{
BeginInvoke(new Action<LogEntry>(AppendLog), entry);
return;
}
System.Windows.Forms.Application.DoEvents();
var wasNearBottom = IsConsoleNearBottom();
var firstVisibleLineBeforeAppend = GetFirstVisibleLine(_console);
@@ -212,14 +204,12 @@ namespace MonsterMonitor.UI
_console.SelectionColor = GetColor(entry.Level);
_console.AppendText($"[{entry.Timestamp:HH:mm:ss}] [{entry.Level}] {entry.Message}{Environment.NewLine}");
_console.SelectionColor = _console.ForeColor;
System.Windows.Forms.Application.DoEvents();
if (wasNearBottom)
{
_console.ScrollToCaret();
return;
}
System.Windows.Forms.Application.DoEvents();
var firstVisibleLineAfterAppend = GetFirstVisibleLine(_console);
var linesToRestore = firstVisibleLineBeforeAppend - firstVisibleLineAfterAppend;
@@ -227,7 +217,6 @@ namespace MonsterMonitor.UI
{
SendMessage(_console.Handle, EmLineScroll, IntPtr.Zero, (IntPtr)linesToRestore);
}
System.Windows.Forms.Application.DoEvents();
}
private bool IsConsoleNearBottom()