From d6053de9386e104b92f4dfe69744c292fe3b1d3a Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Thu, 12 Oct 2023 17:49:08 +0300 Subject: [PATCH] =?UTF-8?q?WeifenLuoLinux=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B2=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B5=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 +-- ...uo.WinFormsUI.Docking.ThemeVS2005Linux.dll | Bin 90112 -> 90112 bytes .../WeifenLuo.WinFormsUI.DockingLinux.dll | Bin 244736 -> 244736 bytes Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- WeifenLuoLinux/WinFormsUI/ThemeVS2005.csproj | 27 ++++++------------ .../ThemeVS2005/VS2005DockPaneStrip.cs | 4 ++- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 8b0fa9d7b..8a0a43798 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 = "3371"; + public const string Revision = "3372"; 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 8abe01b6f..70b16f66f 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=9 -%REVISION%=3371 %COREVERSION%=0 +%REVISION%=3372 +%MINOR%=9 %MAJOR%=3 diff --git a/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll b/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll index 72fa5e691490582d06675f079313f01ae5cf49de..303745b160d0ce5e77058e2a08ce5b35f63edf2c 100644 GIT binary patch delta 6161 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 URDSigEN^$fHdgsbsY>V!Z delta 6183 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 U%1@q_DOvk%Ba}NzO}h7g0Lj)^#Q*>R diff --git a/Libraries/WeifenLuo.WinFormsUI.DockingLinux.dll b/Libraries/WeifenLuo.WinFormsUI.DockingLinux.dll index 7ef0539950e4b86f88687d6e6c624b3eda9c67af..9895684109568d921c9e0988b1941e9f42e6de40 100644 GIT binary patch delta 260 zcmZqp!PoGEZ$byl`bD>IPVDhv&go}qyxn@6vGq37*4xY{?F8N^GHt1T^VF-Yo7;h9 zkx1|ME%wY?3hN*2U8T*lW~Xc)RsBW9x0Et+$y^+6gc!SS>zZ&hNSD$!<2~ z8?KACZ?R|IQdrL)vt8F#`Mvbwnq;r^DQd5`CC6#hh9|}>TlS}y)#6NNN1a8?!VblW zYlS|YjQJL&ym_X<(cn`eIh86)%6Uz1u7E;#c@H z^~iXp7lQBYPAQ)eHwmp_t=_P!r?7m5VAB2cJ1gZRD*1$;h=>$$?qvXis*~TErhnMT z93arg?3i3y?CZI{true dockpanelsuite.snk false - true + false @@ -37,21 +37,13 @@ True True - - Component - + - - Component - + - - Component - - - Component - + + @@ -64,12 +56,6 @@ Always - - - {C75532C4-765B-418E-B09B-46D36B2ABDB1} - WinFormsUI - - ResXFileCodeGenerator @@ -154,5 +140,8 @@ + + + diff --git a/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs b/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs index 3c20b27c8..a6ae1acdb 100644 --- a/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs +++ b/WeifenLuoLinux/WinFormsUI/ThemeVS2005/VS2005DockPaneStrip.cs @@ -119,7 +119,7 @@ namespace WeifenLuo.WinFormsUI.Docking private const int _DocumentTabGapTop = 3; private const int _DocumentTabGapLeft = 3; private const int _DocumentTabGapRight = 3; - private const int _DocumentIconGapBottom = 2; + private const int _DocumentIconGapBottom = 5; private const int _DocumentIconGapLeft = 8; private const int _DocumentIconGapRight = 0; private const int _DocumentIconHeight = 16; @@ -1365,6 +1365,8 @@ namespace WeifenLuo.WinFormsUI.Docking else rectText.Width = rect.Width - DocumentIconGapLeft - DocumentTextGapRight; + rectText.Height = rectText.Height + 4; + Rectangle rectTab = DrawHelper.RtlTransform(this, rect); Rectangle rectBack = DrawHelper.RtlTransform(this, rect); rectBack.Width += DocumentIconGapLeft;