Implement bezzad issue #2: Search/Scroll not working

Limitations: - Highlighting the current match not always work - The order of matches is random within a page
majkimester · Sep 17, 2023 · 5080cbe · 5080cbe
1 parent 98e1f5a
commit 5080cbe
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 155 deletions.
diff --git a/src/PdfiumViewer.Demo/MainWindow.xaml b/src/PdfiumViewer.Demo/MainWindow.xaml
@@ -81,7 +81,8 @@
                    Placement="Bottom"
                    PlacementRectangle="0,20,0,20"
                    PlacementTarget = "{Binding ElementName=BtnSearch}"
-                   PopupAnimation="Slide">
+                   PopupAnimation="Slide"
+                   Opened="SearchPopup_Opened">
 
                 <Border Background="WhiteSmoke" Height="50" 
                         HorizontalAlignment="Center" 

diff --git a/src/PdfiumViewer.Demo/MainWindow.xaml.cs b/src/PdfiumViewer.Demo/MainWindow.xaml.cs
@@ -89,8 +89,12 @@ public double ZoomPercent
         public bool IsSearchOpen { get => _isSearchOpen; set => SetProperty(ref _isSearchOpen, value); }
         private bool _isSearchOpen;
 
-        public int SearchMatchItemNo { get; set; }
-        public int SearchMatchesCount { get; set; }
+        public int SearchMatchItemNo { get => _searchMatchItemNo; set => SetProperty(ref _searchMatchItemNo, value); }
+        private int _searchMatchItemNo;
+
+        public int SearchMatchesCount { get => _searchMatchesCount; set => SetProperty(ref _searchMatchesCount, value); }
+        private int _searchMatchesCount;
+
         public int Page
         {
             get => Renderer.PageNo + 1;
@@ -139,6 +143,7 @@ private void OpenPdf(object sender, RoutedEventArgs e)
 
             if (dialog.ShowDialog() == true)
             {
+                SearchManager.Reset();
                 Renderer.OpenPdf(new FileStream(dialog.FileName, FileMode.Open, FileAccess.Read, FileShare.Read));
 
                 // Open Thumbnails
@@ -339,7 +344,7 @@ private void Search()
             else
             {
                 SearchMatchesCount = SearchManager.MatchesCount;
-                // DisplayTextSpan(SearchMatches.Items[SearchMatchItemNo++].TextSpan);
+                SearchMatchItemNo = 1;
             }
 
             if (!SearchManager.FindNext(true))
@@ -357,7 +362,6 @@ private void OnNextFoundClick(object sender, RoutedEventArgs e)
             if (SearchMatchesCount > SearchMatchItemNo)
             {
                 SearchMatchItemNo++;
-                //DisplayTextSpan(SearchMatches.Items[SearchMatchItemNo - 1].TextSpan);
                 SearchManager.FindNext(true);
             }
         }
@@ -367,7 +371,6 @@ private void OnPrevFoundClick(object sender, RoutedEventArgs e)
             if (SearchMatchItemNo > 1)
             {
                 SearchMatchItemNo--;
-                // DisplayTextSpan(SearchMatches.Items[SearchMatchItemNo - 1].TextSpan);
                 SearchManager.FindNext(false);
             }
         }
@@ -480,5 +483,10 @@ private void OnPrint(object sender, RoutedEventArgs e)
         }
 
         #endregion
+
+        private void SearchPopup_Opened(object sender, EventArgs e)
+        {
+            SearchTermTextBox.Focus();
+        }
     }
 }
diff --git a/src/PdfiumViewer/Core/PdfMarker.cs b/src/PdfiumViewer/Core/PdfMarker.cs
@@ -1,51 +1,56 @@
-using System;
-using System.Drawing;
-using System.Windows;
-using System.Windows.Media;
-using PdfiumViewer.Drawing;
-using Color = System.Windows.Media.Color;
-using Pen = System.Windows.Media.Pen;
-
-namespace PdfiumViewer.Core
-{
-    public class PdfMarker : IPdfMarker
-    {
-        public int Page { get; }
-        public RectangleF Bounds { get; }
-        public Color Color { get; }
-        public Color BorderColor { get; }
-        public float BorderWidth { get; }
-
-        public PdfMarker(int page, RectangleF bounds, Color color)
-            : this(page, bounds, color, Colors.Transparent, 0)
-        {
-        }
-
-        public PdfMarker(int page, RectangleF bounds, Color color, Color borderColor, float borderWidth)
-        {
-            Page = page;
-            Bounds = bounds;
-            Color = color;
-            BorderColor = borderColor;
-            BorderWidth = borderWidth;
-        }
-
-        public void Draw(PdfRenderer renderer, DrawingContext graphics)
-        {
-            if (renderer == null)
-                throw new ArgumentNullException(nameof(renderer));
-            if (graphics == null)
-                throw new ArgumentNullException(nameof(graphics));
-
-            Rect bounds = renderer.BoundsFromPdf(new PdfRectangle(Page, Bounds));
-            var brush = new SolidColorBrush(Color) { Opacity = .8 };
-            var pen = new Pen(new SolidColorBrush(BorderColor) { Opacity = .8 }, BorderWidth);
-            graphics.DrawRectangle(brush, null, bounds);
-
-            if (BorderWidth > 0)
-            {
-                graphics.DrawRectangle(null, pen, bounds);
-            }
-        }
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Media;
+using PdfiumViewer.Drawing;
+using Color = System.Windows.Media.Color;
+using Pen = System.Windows.Media.Pen;
+
+namespace PdfiumViewer.Core
+{
+    public class PdfMarker : IPdfMarker
+    {
+        public int Page { get; }
+        public RectangleF Bounds { get; }
+        public Color Color { get; }
+        public Color BorderColor { get; }
+        public float BorderWidth { get; }
+
+        public PdfMarker(int page, RectangleF bounds, Color color)
+            : this(page, bounds, color, Colors.Transparent, 0)
+        {
+        }
+
+        public PdfMarker(int page, RectangleF bounds, Color color, Color borderColor, float borderWidth)
+        {
+            Page = page;
+            Bounds = bounds;
+            Color = color;
+            BorderColor = borderColor;
+            BorderWidth = borderWidth;
+        }
+
+        public void Draw(PdfRenderer renderer, DrawingContext graphics)
+        {
+            if (renderer == null)
+                throw new ArgumentNullException(nameof(renderer));
+            if (graphics == null)
+                throw new ArgumentNullException(nameof(graphics));
+
+            Rect? bounds = renderer.BoundsFromPdf(new PdfRectangle(Page, Bounds));
+            if (bounds == null) return;
+
+            Debug.WriteLine("DrawMarker[" + Page + "]: " + Color + ", bounds=" + bounds);
+
+            var brush = new SolidColorBrush(Color) { Opacity = .8 };
+            graphics.DrawRectangle(brush, null, bounds.Value);
+
+            if (BorderWidth > 0)
+            {
+                var pen = new Pen(new SolidColorBrush(BorderColor) { Opacity = .8 }, BorderWidth);
+                graphics.DrawRectangle(null, pen, bounds.Value);
+            }
+        }
+    }
+}
diff --git a/src/PdfiumViewer/Core/PdfSearchManager.cs b/src/PdfiumViewer/Core/PdfSearchManager.cs
@@ -150,8 +150,6 @@ public bool FindNext(bool forward)
                 _firstMatch = _offset;
 
                 UpdateHighlights();
-                ScrollCurrentIntoView();
-
                 return true;
             }
 
@@ -169,16 +167,19 @@ public bool FindNext(bool forward)
             }
 
             UpdateHighlights();
-            ScrollCurrentIntoView();
 
             return _offset != _firstMatch;
         }
 
         private void ScrollCurrentIntoView()
         {
+            if (_offset == -1) return;
             var current = _bounds[_offset];
-            if (current.Count > 0)
-                Renderer.ScrollIntoView(current[0]);
+            if (current.Count > 0)
+            {
+                Renderer.GotoPage(current[0].Page, forceRender: true);
+                Renderer.ScrollIntoView(current[0]);
+            }
         }
 
         private int FindFirstFromCurrentPage()
@@ -217,13 +218,16 @@ private void UpdateHighlights()
             {
                 for (int i = 0; i < _matches.Items.Count; i++)
                 {
-                    AddMatch(i, i == _offset);
+                    bool current = _offset == -1 ? false : i == _offset;
+                    AddMatch(i, current);
                 }
             }
             else if (_offset != -1)
             {
                 AddMatch(_offset, true);
             }
+            Renderer.RedrawMarkers();
+            ScrollCurrentIntoView();
         }
 
         private void AddMatch(int index, bool current)

diff --git a/src/PdfiumViewer/Drawing/PdfImage.cs b/src/PdfiumViewer/Drawing/PdfImage.cs
@@ -0,0 +1,21 @@
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace PdfiumViewer.Drawing
+{
+    public class PdfImage : Image
+    {
+        public PdfRenderer Renderer { get; set; }
+        public int PageNo {get; set; }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+            if (Source != null)
+            {
+                Renderer.EnsureMarkers();
+                Renderer.DrawMarkers(drawingContext, PageNo);
+            }
+        }
+    }
+}