Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 14:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2903 from mRemoteNG/copilot/fix-about-tab-close-dialog

Browse Source 
Fix About tab showing connection close dialog when closed
This commit is contained in:
Dimitrij
2025-10-16 04:54:20 +01:00
committed by GitHub
parent 2965f598ac 4ae8e4252b
commit 4307dd043e
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mRemoteNG/UI/Forms/FrmAbout.Designer.cs generated
View File

@@ -142,14 +142,9 @@
Controls.Add(pbLogo);
Font = new System.Drawing.Font("Segoe UI", 8.25F);
ForeColor = System.Drawing.SystemColors.ControlText;
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
MaximizeBox = false;
MaximumSize = new System.Drawing.Size(20000, 10000);
MinimizeBox = false;
Name = "frmAbout";
StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
Text = "About";
TopMost = true;
TabText = "About";
((System.ComponentModel.ISupportInitialize)pbLogo).EndInit();
pnlBottom.ResumeLayout(false);
pnlBottom.PerformLayout();

10
mRemoteNG/UI/Forms/FrmAbout.cs
View File

@@ -7,11 +7,12 @@ using System.Reflection;
using mRemoteNG.Properties;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
using mRemoteNG.UI.Window;
namespace mRemoteNG.UI.Forms
{
[SupportedOSPlatform("windows")]
public partial class frmAbout : Form
public partial class frmAbout : BaseWindow
{
public static frmAbout Instance { get; set; } = new frmAbout();
@@ -28,6 +29,7 @@ namespace mRemoteNG.UI.Forms
{
lblLicense.Text = Language.ReleasedUnderGPL;
base.Text = Language.MenuItem_About;
TabText = Language.MenuItem_About;
llChangelog.Text = Language.Changelog;
llCredits.Text = Language.Credits;
llLicense.Text = Language.License;
@@ -50,9 +52,9 @@ namespace mRemoteNG.UI.Forms
protected override void OnFormClosing(FormClosingEventArgs e)
{
base.OnFormClosing(e);
e.Cancel = true;
Hide();
// Don't cancel close when shown in DockPanel
// This allows the tab to close properly without showing connection close dialog
}
private void llLicense_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

7
mRemoteNG/UI/Menu/msMain/HelpMenu.cs
View File

@@ -202,7 +202,12 @@ namespace mRemoteNG.UI.Menu
private void mMenInfoDonate_Click(object? sender, EventArgs e) => Process.Start("explorer.exe", GeneralAppInfo.UrlDonate);
private void mMenInfoAbout_Click(object? sender, EventArgs e) => frmAbout.Instance.Show();
private void mMenInfoAbout_Click(object? sender, EventArgs e)
{
if (frmAbout.Instance == null || frmAbout.Instance.IsDisposed)
frmAbout.Instance = new frmAbout();
frmAbout.Instance.Show(FrmMain.Default.pnlDock);
}
#endregion
}