Browse Source

Fixed bug in text editor options panel.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
commit
e1afc488fb
  1. BIN
      src/AddIns/AddIns/DisplayBindings/ResourceEditor.dll
  2. BIN
      src/AddIns/AddIns/DisplayBindings/ResourceEditor.pdb
  3. BIN
      src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.dll
  4. BIN
      src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.pdb
  5. 23
      src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
  6. 1
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs
  7. 2
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs
  8. 2
      src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs

BIN
src/AddIns/AddIns/DisplayBindings/ResourceEditor.dll

Binary file not shown.

BIN
src/AddIns/AddIns/DisplayBindings/ResourceEditor.pdb

Binary file not shown.

BIN
src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.dll

Binary file not shown.

BIN
src/AddIns/AddIns/Misc/FiletypeRegisterer/ICSharpCode.FiletypeRegisterer.pdb

Binary file not shown.

23
src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs

@ -572,20 +572,17 @@ namespace ICSharpCode.TextEditor @@ -572,20 +572,17 @@ namespace ICSharpCode.TextEditor
// flags
// );
// }
SizeF wordSize = g.MeasureString(word, font, 32768, measureStringFormat);
float wordWidth = g.MeasureString(word, font, 32768, measureStringFormat).Width;
g.FillRectangle(backBrush,
new RectangleF(position.X, position.Y, (float)Math.Ceiling(wordWidth), FontHeight));
if (DrawingPosition.Left < position.X + DrawingPosition.X) {
g.FillRectangle(backBrush,
new RectangleF(position.X, position.Y, (float)Math.Ceiling(wordSize.Width), FontHeight));
g.DrawString(word,
font,
BrushRegistry.GetBrush(foreColor),
position.X,
position.Y,
measureStringFormat);
}
return wordSize.Width;
g.DrawString(word,
font,
BrushRegistry.GetBrush(foreColor),
position.X,
position.Y,
measureStringFormat);
return wordWidth;
}
#endregion

1
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/FileNode.cs

@ -35,6 +35,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -35,6 +35,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
set {
projectItem = value;
Tag = projectItem;
}
}

2
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs

@ -16,6 +16,8 @@ namespace ICSharpCode.SharpDevelop.Project @@ -16,6 +16,8 @@ namespace ICSharpCode.SharpDevelop.Project
public ReferenceNode(ReferenceProjectItem referenceProjectItem)
{
this.referenceProjectItem = referenceProjectItem;
Tag = referenceProjectItem;
ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ReferenceNode";
SetIcon("Icons.16x16.Reference");
Text = referenceProjectItem.Include;

2
src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs

@ -60,7 +60,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels @@ -60,7 +60,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels
((Properties)CustomizationObject).Set("CursorBehindEOL", ((CheckBox)ControlDictionary["caretBehindEOLCheckBox"]).Checked);
((Properties)CustomizationObject).Set("AutoInsertTemplates", ((CheckBox)ControlDictionary["auotInsertTemplatesCheckBox"]).Checked);
((Properties)CustomizationObject).Set("IndentStyle", ((ComboBox)ControlDictionary["indentStyleComboBox"]).SelectedIndex);
((Properties)CustomizationObject).Set("IndentStyle", (IndentStyle)((ComboBox)ControlDictionary["indentStyleComboBox"]).SelectedIndex);
try {
int tabSize = Int32.Parse(ControlDictionary["tabSizeTextBox"].Text);

Loading…
Cancel
Save