Fixed column displayed in status bar.

icsharpcode · Sep 28, 2010 · c143e6c · c143e6c
1 parent 169c640
commit c143e6c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Threading;
+using ICSharpCode.AvalonEdit.AddIn.Options;
 using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Utils;
@@ -182,7 +183,17 @@ public override INavigationPoint BuildNavPoint()
 		void CaretChanged(object sender, EventArgs e)
 		{
 			NavigationService.Log(this.BuildNavPoint());
-			WorkbenchSingleton.StatusBar.SetCaretPosition(this.Column, this.Line, this.Column);
+			var document = codeEditor.Document;
+			int lineOffset = document.GetLineByNumber(this.Line).Offset;
+			int chOffset = this.Column;
+			int col = 1;
+			for (int i = 1; i < chOffset; i++) {
+				if (document.GetCharAt(lineOffset + i - 1) == '\t')
+					col += CodeEditorOptions.Instance.IndentationSize;
+				else
+					col += 1;
+			}
+			WorkbenchSingleton.StatusBar.SetCaretPosition(col, this.Line, chOffset);
 		}
 
 		public override bool IsReadOnly {