Move the fallback text logic for navigation into Rust.

Author: trypsynth

app/document_manager.cpp

@@ -300,7 +300,7 @@ void document_manager::navigate_to_section(bool next) const {
 	}
 	const long offset = static_cast<long>(result.offset);
 	text_ctrl->SetInsertionPoint(offset);
-	const wxString current_line = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
+	const wxString current_line = rust_to_wx(rust::String(result.marker_text));
 	if (result.wrapped)
 		speak((next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + current_line);
 	else
@@ -347,7 +347,7 @@ void document_manager::navigate_to_page(bool next) const {
 	}
 	const long offset = static_cast<long>(result.offset);
 	text_ctrl->SetInsertionPoint(offset);
-	const wxString current_line = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
+	const wxString current_line = rust_to_wx(rust::String(result.marker_text));
 	wxString message = wxString::Format(_("Page %d: %s"), result.marker_index + 1, current_line);
 	if (result.wrapped) message = (next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + message;
 	speak(message);
@@ -433,10 +433,7 @@ void document_manager::navigate_to_link(bool next) const {
 	}
 	const long offset = static_cast<long>(result.offset);
 	text_ctrl->SetInsertionPoint(offset);
-	wxString link_text = rust_to_wx(rust::String(result.marker_text));
-	if (link_text.IsEmpty()) {
-		link_text = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
-	}
+	const wxString link_text = rust_to_wx(rust::String(result.marker_text));
 	wxString message = link_text + _(" link");
 	if (result.wrapped) message = (next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + message;
 	speak(message);
@@ -518,7 +515,7 @@ void document_manager::navigate_to_list(bool next) const {
 	}
 	const long offset = static_cast<long>(result.offset);
 	text_ctrl->SetInsertionPoint(offset);
-	const wxString current_line = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
+	const wxString current_line = rust_to_wx(rust::String(result.marker_text));
 	wxString message = current_line;
 	if (result.wrapped) message = (next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + message;
 	speak(message);
@@ -548,7 +545,7 @@ void document_manager::navigate_to_list_item(bool next) const {
 	}
 	const long offset = static_cast<long>(result.offset);
 	text_ctrl->SetInsertionPoint(offset);
-	const wxString current_line = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
+	const wxString current_line = rust_to_wx(rust::String(result.marker_text));
 	wxString message = current_line;
 	if (result.wrapped) message = (next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + message;
 	speak(message);
@@ -874,9 +871,6 @@ void document_manager::navigate_to_table(bool next) const {
 	text_ctrl->SetInsertionPoint(offset);
 	// Use marker_text (caption or first row) if available, otherwise use line text.
 	wxString message = rust_to_wx(rust::String(result.marker_text));
-	if (message.IsEmpty()) {
-		message = rust_to_wx(session_get_line_text(*tab->get_session(), offset));
-	}
 	if (result.wrapped) message = (next ? _("Wrapping to start. ") : _("Wrapping to end. ")) + message;
 	speak(message);
 }

lib/src/session.rs

@@ -208,7 +208,11 @@ impl DocumentSession {
 			level_filter: 0,
 		};
 		let result = reader_navigate(&self.handle, &req);
-		NavigationResult::from_nav_result(&result)
+		let mut nav_result = NavigationResult::from_nav_result(&result);
+		if nav_result.found && nav_result.marker_text.is_empty() {
+			nav_result.marker_text = self.get_line_text(nav_result.offset);
+		}
+		nav_result
 	}
 
 	#[must_use]
@@ -245,6 +249,9 @@ impl DocumentSession {
 		if nav_result.found {
 			let offset = usize::try_from(nav_result.offset).unwrap_or(0);
 			nav_result.marker_index = self.handle.page_index(offset).unwrap_or(-1);
+			if nav_result.marker_text.is_empty() {
+				nav_result.marker_text = self.get_line_text(nav_result.offset);
+			}
 		}
 		nav_result
 	}
@@ -263,7 +270,11 @@ impl DocumentSession {
 			level_filter: 0,
 		};
 		let result = reader_navigate(&self.handle, &req);
-		NavigationResult::from_nav_result(&result)
+		let mut nav_result = NavigationResult::from_nav_result(&result);
+		if nav_result.found && nav_result.marker_text.is_empty() {
+			nav_result.marker_text = self.get_line_text(nav_result.offset);
+		}
+		nav_result
 	}
 
 	#[must_use]
@@ -283,7 +294,11 @@ impl DocumentSession {
 			level_filter: 0,
 		};
 		let result = reader_navigate(&self.handle, &req);
-		NavigationResult::from_nav_result(&result)
+		let mut nav_result = NavigationResult::from_nav_result(&result);
+		if nav_result.found && nav_result.marker_text.is_empty() {
+			nav_result.marker_text = self.get_line_text(nav_result.offset);
+		}
+		nav_result
 	}
 
 	#[must_use]
@@ -303,7 +318,11 @@ impl DocumentSession {
 			level_filter: 0,
 		};
 		let result = reader_navigate(&self.handle, &req);
-		NavigationResult::from_nav_result(&result)
+		let mut nav_result = NavigationResult::from_nav_result(&result);
+		if nav_result.found && nav_result.marker_text.is_empty() {
+			nav_result.marker_text = self.get_line_text(nav_result.offset);
+		}
+		nav_result
 	}
 
 	#[must_use]
@@ -320,7 +339,11 @@ impl DocumentSession {
 			level_filter: 0,
 		};
 		let result = reader_navigate(&self.handle, &req);
-		NavigationResult::from_nav_result(&result)
+		let mut nav_result = NavigationResult::from_nav_result(&result);
+		if nav_result.found && nav_result.marker_text.is_empty() {
+			nav_result.marker_text = self.get_line_text(nav_result.offset);
+		}
+		nav_result
 	}
 
 	#[must_use]