Fix Search (#78)

* fix previous

* Proper highlighting

* Calling selection with focus

Author: PaulJonasJost

src/petab_gui/controllers/table_controllers.py

@@ -369,7 +369,7 @@ def cleanse_highlighted_cells(self):
         self.model.dataChanged.emit(top_left, bottom_right,
                                     [Qt.ForegroundRole])
 
-    def focus_match(self, match):
+    def focus_match(self, match, with_focus: bool = False):
         """Focus and select the given match in the table."""
         if match is None:
             self.view.table_view.clearSelection()
@@ -382,11 +382,12 @@ def focus_match(self, match):
         if not proxy_index.isValid():
             return
 
-        self.view.table_view.setCurrentIndex(proxy_index)
         self.view.table_view.setCurrentIndex(proxy_index)
         self.view.table_view.scrollTo(
                 proxy_index, QAbstractItemView.EnsureVisible
         )
+        if with_focus:
+            self.view.table_view.setFocus()
 
     def replace_text(self, row, col, replace_text, search_text, case_sensitive, regex):
         """Replace the text in the given cell and update highlights."""

src/petab_gui/models/pandas_table_model.py

@@ -1,8 +1,8 @@
 import pandas as pd
 from PySide6.QtCore import (Qt, QAbstractTableModel, QModelIndex, Signal,
                             QSortFilterProxyModel, QMimeData)
-from PySide6.QtGui import QColor, QBrush
-
+from PySide6.QtGui import QColor, QBrush, QPalette
+from PySide6.QtWidgets import QApplication
 from ..C import COLUMNS
 from ..utils import validate_value, create_empty_dataframe, is_invalid, \
     get_selected
@@ -61,7 +61,7 @@ def data(self, index, role=Qt.DisplayRole):
         elif role == Qt.ForegroundRole:
             # Return yellow text if this cell is a match
             if (row, column) in self.highlighted_cells:
-                return QBrush(QColor(255, 255, 0))  # Yellow color
+                return QApplication.palette().color(QPalette.HighlightedText)
             return QBrush(QColor(0, 0, 0))  # Default black text
         return None
 
@@ -444,6 +444,8 @@ def determine_background_color(self, row, column):
         """
         if (row, column) == (self._data_frame.shape[0], 0):
             return QColor(144, 238, 144, 150)
+        if (row, column) in self.highlighted_cells:
+            return QApplication.palette().color(QPalette.Highlight)
         if (row, column) in self._invalid_cells:
             return QColor(255, 100, 100, 150)
         if row % 2 == 0:
@@ -538,6 +540,11 @@ def data(self, index, role=Qt.DisplayRole):
             return str(value)
         elif role == Qt.BackgroundRole:
             return self.determine_background_color(row, column)
+        elif role == Qt.ForegroundRole:
+            # Return yellow text if this cell is a match
+            if (row, column) in self.highlighted_cells:
+                return QApplication.palette().color(QPalette.HighlightedText)
+            return QBrush(QColor(0, 0, 0))  # Default black text
         return None
 
     def headerData(self, section, orientation, role=Qt.DisplayRole):

src/petab_gui/utils.py

@@ -831,16 +831,19 @@ def find_next(self):
         controller.focus_match(None)
         self.current_match_ind = (self.current_match_ind + 1) % len(self.matches)
         row, col, controller = self.matches[self.current_match_ind]
-        controller.focus_match((row, col))
+        controller.focus_match((row, col), with_focus=True)
         self.update_result_label()
 
     def find_previous(self):
         """Move to the previous match."""
         if not self.matches:
             return
-
-        self.current_match_ind = (self.current_match_ind - 1) % len(self.matches)
-        self.controller.observable_controller.focus_match(self.matches[self.current_match_ind])
+        __, _, controller = self.matches[self.current_match_ind]
+        controller.focus_match(None)
+        self.current_match_ind = (self.current_match_ind - 1) % len(
+            self.matches)
+        row, col, controller = self.matches[self.current_match_ind]
+        controller.focus_match((row, col), with_focus=True)
         self.update_result_label()
 
     def update_result_label(self):
@@ -874,7 +877,7 @@ def replace_current_match(self):
         self.matches.pop(self.current_match_ind)
         self.update_result_label()
         match = self.matches[self.current_match_ind] if self.matches else None
-        self.focus_match(match)
+        self.focus_match(match, with_focus=True)
 
     def replace_all(self):
         """Replace all matches with the given text."""
@@ -901,12 +904,12 @@ def replace_all(self):
             controller.cleanse_highlighted_cells()
         self.run_find()
 
-    def focus_match(self, match):
+    def focus_match(self, match, with_focus: bool = False):
         """Focus the match in the correct table."""
         if not match:
             return
         row, col, controller = match
-        controller.focus_match((row, col))
+        controller.focus_match((row, col), with_focus)
 
     def show_filter_menu(self):
         """Show the filter selection dropdown below the filter button."""