diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 8a0a43798..982857999 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "9"; public const string Build = "0"; - public const string Revision = "3372"; + public const string Revision = "3376"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 70b16f66f..914572273 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=0 -%REVISION%=3372 +%REVISION%=3376 %MINOR%=9 %MAJOR%=3 diff --git a/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll b/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll index 303745b16..251fc24d6 100644 Binary files a/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll and b/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll differ diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index a802d645e..745f7f04f 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3372 +3.9.0.3376 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 19822d45d..d8c4788cd 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3372' +!define VERSION '3.9.0.3376' diff --git a/ReleaseGenerators/sect_Files.nsh b/ReleaseGenerators/sect_Files.nsh index b2b55f341..323e94ed2 100644 --- a/ReleaseGenerators/sect_Files.nsh +++ b/ReleaseGenerators/sect_Files.nsh @@ -3,5 +3,6 @@ SetOutPath "$INSTDIR\Files\Databases" File "Files\Databases\*.csv" + File "Files\Databases\*.txt" File "Files\Words\*.txt" SectionEnd diff --git a/VisualPascalABCNETLinux/Form1.cs b/VisualPascalABCNETLinux/Form1.cs index f2bf248de..917d7b35a 100644 --- a/VisualPascalABCNETLinux/Form1.cs +++ b/VisualPascalABCNETLinux/Form1.cs @@ -299,6 +299,20 @@ namespace VisualPascalABC this.ResumeLayout(false); this.PerformLayout(); } + else if (gr.DpiX >= 144) + { + this.SuspendLayout(); + this.toolStripPanel.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + + toolStrip1.ImageScalingSize = new Size(24, 24); + menuStrip1.ImageScalingSize = new Size(24, 24); + toolStripPanel.Size = new Size(toolStripPanel.Size.Width, 30); + this.toolStripPanel.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + } // !! gr.Dispose(); serviceContainer = new WorkbenchServiceContainer(); diff --git a/VisualPascalABCNETLinux/Workbench/VisibilityService.cs b/VisualPascalABCNETLinux/Workbench/VisibilityService.cs index 5f100e12e..52964c402 100644 --- a/VisualPascalABCNETLinux/Workbench/VisibilityService.cs +++ b/VisualPascalABCNETLinux/Workbench/VisibilityService.cs @@ -643,9 +643,13 @@ namespace VisualPascalABC { if (!BottomTabsVisible) BottomTabsVisible = true; + //BPanel_Resize(null, EventArgs.Empty); + BottomDockPanel.Size = new System.Drawing.Size(1920, 1080); if (DebugWatchListWindow != null) ShowContent(DebugWatchListWindow, false); ShowContent(DebugVariablesListWindow, false); + this.Width = this.Width + 1; + this.Width = this.Width - 1; } } else diff --git a/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs b/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs index a6ae1acdb..8d506f339 100644 --- a/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs +++ b/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs @@ -307,14 +307,36 @@ namespace WeifenLuo.WinFormsUI.Docking if (m_boldFont == null) { - m_font = TextFont; - m_boldFont = new Font(TextFont, FontStyle.Bold); + FontFamily validFontFamily = TextFont.FontFamily; // SSM 12/10/23 + foreach (FontFamily ff in FontFamily.Families) + { + if (ff.Name == TextFont.FontFamily.Name) + { + validFontFamily = ff; + break; + } + } + m_font = new Font(validFontFamily, TextFont.Size, FontStyle.Regular); + + //m_font = TextFont; + m_boldFont = new Font(m_font, FontStyle.Bold); } else if (m_font != TextFont) { m_boldFont.Dispose(); - m_font = TextFont; - m_boldFont = new Font(TextFont, FontStyle.Bold); + + FontFamily validFontFamily = TextFont.FontFamily; // SSM 12/10/23 + foreach (FontFamily ff in FontFamily.Families) + { + if (ff.Name == TextFont.FontFamily.Name) + { + validFontFamily = ff; + break; + } + } + m_font = new Font(validFontFamily, TextFont.Size, FontStyle.Regular); + //m_font = TextFont; + m_boldFont = new Font(m_font, FontStyle.Bold); } return m_boldFont; diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index bc9eb0804..c5ac1e67d 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ