Changeset 2667

Timestamp:

01/21/10 18:34:56 (15 years ago)

Author:

epitzer

Message:

Ensure proper resizing of CodeEditor and don't crash when removing non-existent assemblies (#842)

Location:

trunk/sources/HeuristicLab.CodeEditor/3.2

Files:

• CodeEditor.Designer.cs (modified) (3 diffs)
• CodeEditor.cs (modified) (3 diffs)
• HeuristicLab.CodeEditor-3.2.csproj (modified) (3 diffs)

trunk/sources/HeuristicLab.CodeEditor/3.2/CodeEditor.Designer.cs

@@ -40 +40 @@
       // 
       toolStripFiller.Name = "toolStripFiller";
-      toolStripFiller.Size = new System.Drawing.Size(364, 17);
+      toolStripFiller.Size = new System.Drawing.Size(395, 17);
       toolStripFiller.Spring = true;
       // 
@@ -58 +58 @@
       this.textEditor.ShowTabs = true;
       this.textEditor.ShowVRuler = false;
-      this.textEditor.Size = new System.Drawing.Size(556, 248);
+      this.textEditor.Size = new System.Drawing.Size(556, 245);
       this.textEditor.TabIndent = 2;
       this.textEditor.TabIndex = 0;
@@ -113 +113 @@
       this.Name = "CodeEditor";
       this.Size = new System.Drawing.Size(556, 270);
+      this.Resize += new System.EventHandler(this.CodeEditor_Resize);
       this.statusStrip1.ResumeLayout(false);
       this.statusStrip1.PerformLayout();

trunk/sources/HeuristicLab.CodeEditor/3.2/CodeEditor.cs

@@ -296 +296 @@
         return;
       var content = projectContentRegistry.GetExistingProjectContent(a.Location);
-      projectContent.ReferencedContents.Remove(content);
-      projectContentRegistry.UnloadProjectContent(content);
+      if (content != null) {
+        projectContent.ReferencedContents.Remove(content);
+        projectContentRegistry.UnloadProjectContent(content);
+      }
       ShowMessage("Ready");
     }
@@ -306 +308 @@
       ParseStep();
       BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Ready"; }));
-      while (!IsDisposed) {
-        ParseStep();
-        Thread.Sleep(2000);
-      }
+      try {
+        while (!IsDisposed) {
+          ParseStep();
+          Thread.Sleep(2000);
+        }
+      } catch { }
     }
 
@@ -349 +353 @@
       proc.Start();
     }
+
+    private void CodeEditor_Resize(object sender, EventArgs e) {
+      var textArea = textEditor.ActiveTextAreaControl.TextArea;
+      var vScrollBar = textEditor.ActiveTextAreaControl.VScrollBar;
+      var hScrollBar = textEditor.ActiveTextAreaControl.HScrollBar;
+
+      textArea.SuspendLayout();
+      textArea.Width = textEditor.Width - vScrollBar.Width;
+      textArea.Height = textEditor.Height - hScrollBar.Height;
+      textArea.ResumeLayout();
+
+      vScrollBar.SuspendLayout();
+      vScrollBar.Location = new Point(textArea.Width, 0);
+      vScrollBar.Height = textArea.Height;
+      vScrollBar.ResumeLayout();
+
+      hScrollBar.SuspendLayout();
+      hScrollBar.Location = new Point(0, textArea.Height);
+      hScrollBar.Width = textArea.Width;
+      hScrollBar.ResumeLayout();
+    }
   }
 }

trunk/sources/HeuristicLab.CodeEditor/3.2/HeuristicLab.CodeEditor-3.2.csproj

@@ -75 +75 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.Common.Resources-3.2, Version=3.2.0.2591, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\HeuristicLab.Common.Resources\3.2\bin\x86\Debug\HeuristicLab.Common.Resources-3.2.dll</HintPath>
-    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.2.0.2615, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
@@ -94 +90 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\ICSharpCode.TextEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.6.9.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\Mono.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -137 +137 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.SharpDevelop\3.1.1.5327\HeuristicLab.SharpDevelop-3.1.1.5327.csproj">
       <Project>{4ABA047D-46DD-4608-9E4A-41C5F92FDBB1}</Project>