Bug fix

qluana7 · Jun 7, 2021 · d22a6e0 · d22a6e0
1 parent 9bd390d
commit d22a6e0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 26 deletions.
diff --git a/CSAnalyzer-Preview/Windows/Editor.xaml.cs b/CSAnalyzer-Preview/Windows/Editor.xaml.cs
@@ -139,6 +139,8 @@ private void EventHandling()
                 IsEdited = true;
             };
 
+            TextEditor.TextArea.Caret.PositionChanged += TextEditor_PositionChanged;
+
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
         }
 
@@ -249,6 +251,13 @@ private void TextArea_TextEntering(object sender, TextCompositionEventArgs e)
                     completionWindow.CompletionList.RequestInsertion(e);
         }
 
+        private void TextEditor_PositionChanged(object sender, EventArgs e)
+        {
+            var offset = TextEditor.TextArea.Caret.Position;
+            LineTextBlock.Text = "Ln: " + offset.Line;
+            ColumnTextBlock.Text = "Co: " + offset.Column;
+        }
+
         public void ChangeStatus(Status sta, string str = null)
         {
             StatusImage.Source = (BitmapImage)Resources["Status_" + sta.ToString()];
@@ -441,6 +450,15 @@ private void ChangeIsEnabled(bool b)
 
             for (int i = 0; i < controls.Length; i++)
                 controls[i].IsEnabled = b;
+
+            FrameworkElement[] vcontrols =
+            {
+                LineTextBlock,
+                ColumnTextBlock
+            };
+
+            for (int j = 0; j < vcontrols.Length; j++)
+                vcontrols[j].Visibility = b ? Visibility.Visible : Visibility.Hidden;
         }
 
         private void RecordRecent(string path)

diff --git a/CSAnalyzer/Windows/Editor.xaml.cs b/CSAnalyzer/Windows/Editor.xaml.cs
@@ -92,6 +92,8 @@ private void Init()
                 IsEdited = true;
             };
 
+            TextEditor.TextArea.Caret.PositionChanged += TextEditor_PositionChanged;
+
             CurrentFile = null;
             IsEdited = false;
             ToolUndoButton.IsEnabled = false;
@@ -132,6 +134,13 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
             ChangeStatus(Status.Ready);
         }
 
+        private void TextEditor_PositionChanged(object sender, EventArgs e)
+        {
+            var offset = TextEditor.TextArea.Caret.Position;
+            LineTextBlock.Text = "Ln: " + offset.Line;
+            ColumnTextBlock.Text = "Co: " + offset.Column;
+        }
+
         public void ChangeStatus(Status sta, string str = null)
         {
             StatusImage.Source = (BitmapImage)Resources["Status_" + sta.ToString()];
@@ -276,32 +285,6 @@ private void TextEditor_PreviewTextInput(object sender, TextCompositionEventArgs
             TextEditor.CaretOffset = co + s.Item2 + 1;
         }
 
-        private void SelectWord()
-        {
-            int cursorPosition = TextEditor.SelectionStart;
-            int nextSpace = TextEditor.Text.IndexOf(' ', cursorPosition);
-            int selectionStart = 0;
-            string trimmedString;
-            if (nextSpace != -1)
-            {
-                trimmedString = TextEditor.Text.Substring(0, nextSpace);
-            }
-            else
-            {
-                trimmedString = TextEditor.Text;
-            }
-
-
-            if (trimmedString.LastIndexOf(' ') != -1)
-            {
-                selectionStart = 1 + trimmedString.LastIndexOf(' ');
-                trimmedString = trimmedString.Substring(1 + trimmedString.LastIndexOf(' '));
-            }
-
-            TextEditor.SelectionStart = selectionStart;
-            TextEditor.SelectionLength = trimmedString.Length;
-        }
-
         #region MenuStrip
         private async Task<bool> CheckSave()
         {
@@ -344,6 +327,15 @@ private void ChangeIsEnabled(bool b)
 
             for (int i = 0; i < controls.Length; i++)
                 controls[i].IsEnabled = b;
+
+            FrameworkElement[] vcontrols =
+            {
+                LineTextBlock,
+                ColumnTextBlock
+            };
+
+            for (int j = 0; j < vcontrols.Length; j++)
+                vcontrols[j].Visibility = b ? Visibility.Visible : Visibility.Hidden;
         }
 
         private void RecordRecent(string path)