{Help,Text}Page: reset the cursor location only if invisible

If the cursor still marks the previous find result, don't reset it, or else it will find the same item again.
MusicPlayerDaemon · Feb 1, 2021 · 85bbef3 · 85bbef3
1 parent 2bbc11d
commit 85bbef3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/HelpPage.cxx b/src/HelpPage.cxx
@@ -317,7 +317,13 @@ HelpPage::OnCommand(struct mpdclient &c, Command cmd)
 	if (ListPage::OnCommand(c, cmd))
 		return true;
 
-	lw.SetCursorFromOrigin(0);
+	if (!lw.IsCursorVisible())
+		/* start searching at the beginning of the page (not
+		   where the invisible cursor just happens to be),
+		   unless the cursor is still visible from the last
+		   search */
+		lw.SetCursorFromOrigin(0);
+
 	if (screen_find(screen, lw, cmd, *this)) {
 		SetDirty();
 		return true;

diff --git a/src/TextPage.cxx b/src/TextPage.cxx
@@ -88,7 +88,13 @@ TextPage::OnCommand(struct mpdclient &c, Command cmd)
 	if (ListPage::OnCommand(c, cmd))
 		return true;
 
-	lw.SetCursorFromOrigin(0);
+	if (!lw.IsCursorVisible())
+		/* start searching at the beginning of the page (not
+		   where the invisible cursor just happens to be),
+		   unless the cursor is still visible from the last
+		   search */
+		lw.SetCursorFromOrigin(0);
+
 	if (screen_find(screen, lw, cmd, *this)) {
 		SetDirty();
 		return true;