QuickBrowser улучшил расстояние

ToolPanel = AutoSize
2019-01-11 08:32:45 +03:00 · 2019-01-11 08:32:45 +03:00 · bd78e1a969
parent e05bc689df
commit bd78e1a969
9 changed files with 47 additions and 25 deletions
--- 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 = "4";
 	public const string Build = "2";
-	public const string Revision = "1931";
+	public const string Revision = "1933";

        public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@ -1,4 +1,4 @@
 %COREVERSION%=2
-%REVISION%=1931
+%REVISION%=1933
 %MINOR%=4
 %MAJOR%=3
--- a/NETGenerator/Helpers.cs
+++ b/NETGenerator/Helpers.cs
@ -688,6 +688,10 @@ namespace PascalABCCompiler.NETGenerator {
 		public FldInfo AddField(ICommonClassFieldNode f, FieldInfo fb)
 		{
 			FldInfo fi = new FldInfo(fb);
+            /*if (f.name == "XYZW")
+            {
+                var y = f.GetHashCode();
+            } */
 			defs[f] = fi;
 			return fi;
 		}
@ -695,6 +699,10 @@ namespace PascalABCCompiler.NETGenerator {
        public FldInfo AddGenericField(ICommonClassFieldNode f, FieldInfo fb, Type field_type)
        {
            FldInfo fi = new GenericFldInfo(fb, field_type);
+            /*if (f.name == "XYZW")
+            {
+                var y = f.GetHashCode();
+            } */
            defs[f] = fi;
            return fi;
        }
@ -702,7 +710,11 @@ namespace PascalABCCompiler.NETGenerator {
        //получение поля
 		public FldInfo GetField(ICommonClassFieldNode f)
 		{
-			return (FldInfo)defs[f];
+            /*if (f.name == "XYZW")
+            {
+                var y = f.GetHashCode();
+            } */
+            return (FldInfo)defs[f];
 		}
 		
        //добавление типа
--- a/NETGenerator/NETGenerator.cs
+++ b/NETGenerator/NETGenerator.cs
@ -7849,6 +7849,10 @@ namespace PascalABCCompiler.NETGenerator
        {
            ICommonClassFieldReferenceNode value = (ICommonClassFieldReferenceNode)to;
            FldInfo fi_info = helper.GetField(value.field);
+            /*if (value.field.name == "XYZW")
+            {
+                var y = value.field.GetHashCode();
+            } */
            FieldInfo fi = fi_info.fi;
            is_dot_expr = true;
            has_dereferences = false;
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@ -1 +1 @@
-!define VERSION '3.4.2.1931'
+!define VERSION '3.4.2.1933'
--- a/VisualPascalABCNET/Form1.cs
+++ b/VisualPascalABCNET/Form1.cs
@ -233,14 +233,15 @@ namespace VisualPascalABC
            this.mADDFILEToolStripMenuItem.Image = miNew.Image;
            this.mADDEXISTFILEToolStripMenuItem.Image = miOpen.Image;
            this.mADDFORMToolStripMenuItem.Image = new System.Drawing.Bitmap(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("VisualPascalABC.Resources.Icons.16x16.Form.png"));
-            toolStripPanel.Size = new Size(toolStripPanel.Size.Width, toolStrip1.Height);
-            /*var gr = Graphics.FromHwnd(Handle);
+            //toolStripPanel.Size = new Size(toolStripPanel.Size.Width, toolStrip1.Height);
+            toolStripPanel.AutoSize = true;
+            var gr = Graphics.FromHwnd(Handle);
            if (gr.DpiX >= 96*2)
            {
                toolStrip1.ImageScalingSize = new Size(32, 32);
                menuStrip1.ImageScalingSize = new Size(32, 32);
-                toolStripPanel.Size = new Size(toolStripPanel.Size.Width, 38);
-            } */
+                //toolStripPanel.Size = new Size(toolStripPanel.Size.Width, 38);
+            } 
            serviceContainer = new WorkbenchServiceContainer();

            if (DebuggerVisible)
--- a/VisualPascalABCNET/Form1.resx
+++ b/VisualPascalABCNET/Form1.resx
@ -307,6 +307,21 @@
        d07lxcgmYqk6sX1iENPfdv0Cx/Wod5mP/rvMkCs5SPPOp5qJQ6WOnVOD2IzXiA6B6TRp9PMK470dqLqN
        JO8cT/Oxkwa2jmvEz4Mq4ROIn/YrqSJ2nMZWTEFkR8FqVMZSJImFUAKzq534BOJyW/ju7nIk6Q+B49+g
        +BQZbgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="tstaSelect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="tsatConsoleApplication.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -339,21 +354,6 @@
        saeS2rb7UOgXaTuVTHazh+J2K72OKDpTHEBh1SiuGV8sLLYtFmb8JHwex090zigDU8LZCb1Pl+WA/KsG
        Jj3zsvDoBzC8JxbusgseC5B9pmAzIK+sn7b772judaPudtCktaO5bRO+rJXG1hc0aJ5T12iipnaIGtUw
        5y4qNgNEqeo7yM0rl+jiFeNZnIk7fyOCEhJ+AymIZtFIMC8OAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="tstaSelect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton16.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -681,7 +681,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK
-        FQAAAk1TRnQBSQFMAgEBEAEAAdQBAAHUAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        FQAAAk1TRnQBSQFMAgEBEAEAAdwBAAHcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/VisualPascalABCNET/IB/CodeCompletion/QuickClassBrowserPanel.cs
+++ b/VisualPascalABCNET/IB/CodeCompletion/QuickClassBrowserPanel.cs
@ -742,6 +742,7 @@ namespace VisualPascalABC
            this.membersComboBox.Font = new System.Drawing.Font("Arial", 9F);
            this.membersComboBox.IntegralHeight = false;
            this.membersComboBox.Location = new System.Drawing.Point(198, 0);
+            this.membersComboBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1);
            this.membersComboBox.Name = "membersComboBox";
            this.membersComboBox.Size = new System.Drawing.Size(212, 22);
            this.membersComboBox.TabIndex = 1;
@ -758,6 +759,7 @@ namespace VisualPascalABC
            this.classComboBox.Font = new System.Drawing.Font("Arial", 9F);
            this.classComboBox.IntegralHeight = false;
            this.classComboBox.Location = new System.Drawing.Point(1, 0);
+            this.classComboBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1);
            this.classComboBox.Name = "classComboBox";
            this.classComboBox.Size = new System.Drawing.Size(189, 22);
            this.classComboBox.TabIndex = 0;
@ -771,7 +773,7 @@ namespace VisualPascalABC
            this.Controls.Add(this.membersComboBox);
            this.Controls.Add(this.classComboBox);
            this.Name = "QuickClassBrowserPanel";
-            this.Size = new System.Drawing.Size(410, 25);
+            this.Size = new System.Drawing.Size(410, 23);
            this.Resize += new System.EventHandler(this.QuickClassBrowserPanelResize);
            this.ResumeLayout(false);

--- a/_GenerateAllSetups.bat
+++ b/_GenerateAllSetups.bat
@ -57,6 +57,9 @@ call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET_40.sln
 cd ReleaseGenerators
 call PascalABCNETWithDotNet40.bat

+cd ..
+call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln
+
 GOTO EXIT

 :ERROR