pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update component library, tried to fix exception when switching back from the form designer when deleting controls from the form so that the caret position is after the end of the document. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@572 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
7acfbfc9b4
commit
7e7413ce36
4 changed files with 39 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      data/options/SharpDevelopControlLibrary.sdcl
  2. 4
      src/Libraries/ICSharpCode.Build.Tasks/Test/AssemblyInfo.cs
  3. 1
      src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/Caret.cs
  4. 1
      src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs

68
data/options/SharpDevelopControlLibrary.sdcl
Unescape View File

@ -6,68 +6,64 @@ @@ -6,68 +6,64 @@
</Assemblies>
<Categories>
<Category name="Windows Forms" enabled="True">
<ToolComponent class="System.Windows.Forms.ToolStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.BindingNavigator" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.BindingSource" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Button" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.CheckBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ListBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.CheckedListBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ColorDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ImageList" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ComboBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ContextMenuStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Label" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.RadioButton" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.TextBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DataGridView" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DataGridViewComboBoxEditingControl" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DataGridViewTextBoxEditingControl" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DataNavigator" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.CheckedListBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DateTimePicker" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DomainUpDown" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ErrorProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Panel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.FlowLayoutPanel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.FolderBrowserDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.FontDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.GroupBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.HelpProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.HScrollBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Label" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.LinkLabel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ListView" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ListBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ListView" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.MaskedTextBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.MenuStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.MonthCalendar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.NotifyIcon" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.NumericUpDown" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.OpenFileDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Panel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PictureBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ProgressBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PropertyGrid" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.RadioButton" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.RichTextBox" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.SaveFileDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.SplitContainer" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Splitter" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.SplitterPanel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.StatusBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.StatusStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.TabControl" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.TableLayoutPanel" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Timer" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ToolBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ToolStripContainer" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ToolTip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.TrackBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.TreeView" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.VScrollBar" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.WebBrowser" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ContextMenuStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.MenuStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.StatusStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ToolStrip" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ToolStripContainer" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ColorDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ErrorProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.FontDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.FolderBrowserDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ImageList" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.HelpProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.OpenFileDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PageSetupDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PrintDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PrintPreviewControl" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.PrintPreviewDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.SaveFileDialog" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.Timer" assembly="0" enabled="True" />
</Category>
<Category name="Data" enabled="True">
<ToolComponent class="System.Windows.Forms.BindingNavigator" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.BindingSource" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.DataNavigator" assembly="0" enabled="True" />
<ToolComponent class="System.Data.DataSet" assembly="1" enabled="True" />
<ToolComponent class="System.Data.Odbc.OdbcDataAdapter" assembly="1" enabled="True" />
<ToolComponent class="System.Data.Odbc.OdbcConnection" assembly="1" enabled="True" />
@ -81,11 +77,17 @@ @@ -81,11 +77,17 @@
<ToolComponent class="System.Data.DataView" assembly="1" enabled="True" />
</Category>
<Category name="Components" enabled="True">
<ToolComponent class="System.IO.FileSystemWatcher" assembly="2" enabled="True" />
<ToolComponent class="System.ComponentModel.BackgroundWorker" assembly="2" enabled="True" />
<ToolComponent class="System.Windows.Forms.ErrorProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Diagnostics.EventLog" assembly="2" enabled="True" />
<ToolComponent class="System.IO.FileSystemWatcher" assembly="2" enabled="True" />
<ToolComponent class="System.Windows.Forms.HelpProvider" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.ImageList" assembly="0" enabled="True" />
<ToolComponent class="System.Windows.Forms.NotifyIcon" assembly="0" enabled="True" />
<ToolComponent class="System.Diagnostics.PerformanceCounter" assembly="2" enabled="True" />
<ToolComponent class="System.Diagnostics.Process" assembly="2" enabled="True" />
<ToolComponent class="System.Timers.Timer" assembly="2" enabled="True" />
<ToolComponent class="System.IO.Ports.SerialPort" assembly="2" enabled="True" />
<ToolComponent class="System.Windows.Forms.Timer" assembly="0" enabled="True" />
</Category>
</Categories>
</SharpDevelopControlLibrary>

4
src/Libraries/ICSharpCode.Build.Tasks/Test/AssemblyInfo.cs
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
// Information about this assembly is defined by the following
@ -23,5 +23,5 @@ using System.Runtime.CompilerServices; @@ -23,5 +23,5 @@ using System.Runtime.CompilerServices;
// You can specify all values by your own or you can build default build and revision
// numbers with the '*' character (the default):
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.1")]

1
src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/Caret.cs
Unescape View File

@ -172,6 +172,7 @@ namespace ICSharpCode.TextEditor @@ -172,6 +172,7 @@ namespace ICSharpCode.TextEditor
}
}
if (currentPos.X < 0) {
ValidateCaretPos();
currentPos = ScreenPosition;
}
SetCaretPos(currentPos.X, currentPos.Y);

1
src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
Unescape View File

@ -870,6 +870,7 @@ namespace ICSharpCode.TextEditor @@ -870,6 +870,7 @@ namespace ICSharpCode.TextEditor
float CountColumns(ref int column, int start, int end, int logicalLine, Graphics g)
{
if (start > end) throw new ArgumentException("start > end");
if (start == end) return 0;
float spaceWidth = SpaceWidth;
float drawingPos = 0;
int tabIndent = Document.TextEditorProperties.TabIndent;

Write Preview
Loading…
Cancel
Save