Added option to highlight current line.

XamDR · Aug 3, 2020 · 82677ed · 82677ed
1 parent 716761d
commit 82677ed
Show file tree

Hide file tree

Showing 19 changed files with 340 additions and 457 deletions.
diff --git a/ModernNotepad/App.xaml.cs b/ModernNotepad/App.xaml.cs
@@ -1,9 +1,9 @@
-using ModernNotepadLibrary.ViewModels;
+using ModernNotepad.Util;
+using ModernNotepadLibrary.ViewModels;
 using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows;
 using System.Windows.Threading;
@@ -37,7 +37,6 @@ protected override void OnStartup(StartupEventArgs e)
                 MainViewModel.Title = Path.GetFileName(e.Args[0]);
                 MainViewModel.FilePath = Path.GetFullPath(e.Args[0]);
                 MainViewModel.TextEditor.TextArea.Text = File.ReadAllText(e.Args[0], Encoding.Default);
-                //MainViewModel.TextEditor.SavedAsFile = true;
                 MainViewModel.SaveFileService.FileName = e.Args[0];
             }
         }
@@ -68,7 +67,7 @@ private void Application_DispatcherUnhandledException(object sender, DispatcherU
             WriteLogFile(e.Exception.ToString());
             const long MB_OK = 0x0L, MB_ERROR = 0x10L;
             var message = MainViewModel.LocaleManager.LoadString("ErrorMessage");            
-            MessageBox(IntPtr.Zero, message, "Modern Notepad", (uint)(MB_OK | MB_ERROR));
+            NativeMethods.MessageBox(IntPtr.Zero, message, "Modern Notepad", (uint)(MB_OK | MB_ERROR));
             e.Handled = true;
             Current.Shutdown();
         }
@@ -78,8 +77,5 @@ private void WriteLogFile(string message)
             var logPath = @$"{Directory.GetCurrentDirectory()}\error.log";
             File.WriteAllText(logPath, message);
         }
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern int MessageBox(IntPtr hWnd, string lpText, string lpCaption, uint uType);
     }
 }
diff --git a/ModernNotepad/Behaviors/SelectionChangedBehavior.cs b/ModernNotepad/Behaviors/SelectionChangedBehavior.cs
@@ -37,13 +37,12 @@ protected override void OnDetaching()
         }
 
         private void OnSelectionChanged(object sender, RoutedEventArgs e)
-        {
-            var charIndex = AssociatedObject.SelectionStart;
-            var currentLine = AssociatedObject.GetLineIndexFromCharacterIndex(charIndex) + 1;
+        {            
+            var currentLine = AssociatedObject.GetLineIndexFromCharacterIndex(AssociatedObject.CaretIndex) + 1;
             CurrentLine = $"{Application.Current.TryFindResource("CurrentLine")}: {currentLine}";
 
             var firstCharIndex = AssociatedObject.GetCharacterIndexFromLineIndex(currentLine - 1);
-            var currentCharacter = charIndex - firstCharIndex + 1;
+            var currentCharacter = AssociatedObject.CaretIndex - firstCharIndex + 1;
             CurrentCharacter = $"{Application.Current.TryFindResource("CurrentChar")}: {currentCharacter}";
 
         }

diff --git a/ModernNotepad/Behaviors/ZoomBehavior.cs b/ModernNotepad/Behaviors/ZoomBehavior.cs
diff --git a/ModernNotepad/Converters/StringToZoomFactorConverter.cs b/ModernNotepad/Converters/StringToZoomFactorConverter.cs
diff --git a/ModernNotepad/CustomControls/DraggableBorder.cs b/ModernNotepad/CustomControls/DraggableBorder.cs
diff --git a/ModernNotepad/CustomControls/TextArea.cs b/ModernNotepad/CustomControls/TextArea.cs
@@ -1,4 +1,6 @@
-using ModernNotepadLibrary.Core;
+using ModernNotepad.Util;
+using ModernNotepadLibrary.Core;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
@@ -12,9 +14,17 @@ public class TextArea : TextBox, ITextArea
         public TextArea()
         {
             AcceptsReturn = true;
-            AcceptsTab = true;            
+            AcceptsTab = true;
+            Loaded += TextArea_Loaded;
         }
 
-        public void SetFontFamily(string fontFamilyName) => FontFamily = new FontFamily(fontFamilyName);        
+        public HighlightCurrentLineAdorner HighlightCurrentLineAdorner { get; private set; }
+
+        public void SetFontFamily(string fontFamilyName) => FontFamily = new FontFamily(fontFamilyName);
+
+        private void TextArea_Loaded(object sender, RoutedEventArgs e)
+        {
+            HighlightCurrentLineAdorner = new HighlightCurrentLineAdorner(this);
+        }
     }
 }
diff --git a/ModernNotepad/Program.cs b/ModernNotepad/Program.cs
@@ -33,6 +33,7 @@ private static void ShowSplashScreen()
         private static void RegisterServices()
         {
             ServiceResolver = new ServiceResolver();
+            ServiceResolver.Register<IAdornerService, AdornerService>();
             ServiceResolver.Register<IApplicationThemeManager, ApplicationThemeManager>();
             ServiceResolver.Register<IContentDialogService, ContentDialogService>();
             ServiceResolver.Register<ILocaleManager, LocaleManager>();

diff --git a/ModernNotepad/Services/AdornerService.cs b/ModernNotepad/Services/AdornerService.cs
@@ -0,0 +1,29 @@
+using ModernNotepad.CustomControls;
+using ModernNotepadLibrary.Core;
+using ModernNotepadLibrary.Services;
+using System.Windows.Documents;
+
+namespace ModernNotepad.Services
+{
+    class AdornerService : IAdornerService
+    {
+        public void AddAdorner(ITextArea textArea)
+        {
+            var adornedTextArea = textArea as TextArea;
+            var adornerLayer = AdornerLayer.GetAdornerLayer(adornedTextArea);
+
+            if (adornerLayer.GetAdorners(adornedTextArea) != null) // Workaround
+            {
+                adornerLayer.Remove(adornedTextArea.HighlightCurrentLineAdorner);
+            }
+            adornerLayer.Add(adornedTextArea.HighlightCurrentLineAdorner);
+        }
+
+        public void RemoveAdorner(ITextArea textArea)
+        {
+            var adornedTextArea = textArea as TextArea;
+            var adornerLayer = AdornerLayer.GetAdornerLayer(adornedTextArea);
+            adornerLayer.Remove(adornedTextArea.HighlightCurrentLineAdorner);
+        }
+    }
+}
diff --git a/ModernNotepad/Services/PrintService.cs b/ModernNotepad/Services/PrintService.cs
@@ -9,13 +9,13 @@ class PrintService : IPrintService
     {
         public void PrintDocument()
         {            
-            if (PrintDialogWrapper.IsPrintJobSendToQueue)
-            {
-                var document = (Application.Current.MainWindow as MainWindow).Document;
-                var documentPaginator = document.DocumentPaginator;
-                var description = (string)Application.Current.TryFindResource("DescriptionPrintJob");
-                PrintDialogWrapper.PrintDocument(documentPaginator, description);
-            }
+            //if (PrintDialogWrapper.IsPrintJobSendToQueue)
+            //{
+            //    var document = (Application.Current.MainWindow as MainWindow).Document;
+            //    var documentPaginator = document.DocumentPaginator;
+            //    var description = (string)Application.Current.TryFindResource("DescriptionPrintJob");
+            //    PrintDialogWrapper.PrintDocument(documentPaginator, description);
+            //}
         }
     }
 }