Issue #69 by P-Storm - Wrap around during search

snakefoot · Jul 16, 2015 · 00e12a0 · 00e12a0
2 parents 3781436 + d6ebe2a
commit 00e12a0
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 131 deletions.
diff --git a/SnakeTail/EventLogForm.cs b/SnakeTail/EventLogForm.cs
@@ -359,7 +359,7 @@ ListViewItem GetNextEntry(int previousRecordId, bool searchForward, int startInd
             return null;    // Should never come here
         }
 
-        public bool SearchForText(string searchText, bool matchCase, bool searchForward, bool lineHighlights)
+        public bool SearchForText(string searchText, bool matchCase, bool searchForward, bool lineHighlights, bool wrapAround)
         {
             int listCount = -1;
 

diff --git a/SnakeTail/ITailForm.cs b/SnakeTail/ITailForm.cs
@@ -23,7 +23,7 @@ public interface ITailForm
     {
         Form TailWindow { get; }
 
-        bool SearchForText(string searchText, bool matchCase, bool searchForward, bool keywordHighlights);
+        bool SearchForText(string searchText, bool matchCase, bool searchForward, bool keywordHighlights, bool wrapAround);
 
         void SaveConfig(TailFileConfig config);
 

diff --git a/SnakeTail/SearchForm.Designer.cs b/SnakeTail/SearchForm.Designer.cs
diff --git a/SnakeTail/SearchForm.cs b/SnakeTail/SearchForm.cs
@@ -87,7 +87,7 @@ public void SearchAgain(ITailForm activeTailForm, bool searchForward, bool keywo
                 {
                     using (new HourGlass(activeTailForm.TailWindow))
                     {
-                        found = ActiveTailForm.SearchForText(_searchTextBox.Text, _matchCaseCheckBox.Checked, searchForward, keywordHighlights);
+                        found = ActiveTailForm.SearchForText(_searchTextBox.Text, _matchCaseCheckBox.Checked, searchForward, keywordHighlights, keywordHighlights ? false : _wrapArroundcheckBox.Checked);
                     }
                 }
                 if (!found)