Scroll to top of table after resorting

Closes #195

Author: svetter

src/comp_tables/composite_table.cpp

@@ -928,6 +928,7 @@ void CompositeTable::sort(int columnIndex, Qt::SortOrder order)
 	currentSorting = {column, order};
 
 	performSort(previousSort, true);
+	Q_EMIT wasResorted();
 }
 
 /**

src/comp_tables/composite_table.h

@@ -84,6 +84,8 @@ struct SortingPass {
  * @see CompositeColumn
  */
 class CompositeTable : public QAbstractTableModel {
+	Q_OBJECT
+	
 	/** The project database. */
 	const Database* const db;
 	/** The database table this table is based on. */
@@ -202,6 +204,12 @@ class CompositeTable : public QAbstractTableModel {
 
 public:
 	ProjectSettings* getProjectSettings() const;
+	
+signals:
+	/**
+	 * Emitted after the table was resorted.
+	 */
+	void wasResorted();
 };
 
 

src/main/main_window.cpp

@@ -197,14 +197,12 @@ void MainWindow::connectUI()
 	connect(mainAreaTabs,					&QTabWidget::currentChanged,	this,	&MainWindow::handle_tabChanged);
 	// Double clicks on table
 	for (const ItemTypeMapper* const mapper : typesHandler->getAllMappers()) {
-		auto openFunction = [this, mapper] (const QModelIndex& index) {
-			if (mapper->type == ItemTypeAscent) {
-				viewItem(mapper, ViewRowIndex(index.row()));
-			} else {
-				editItem(mapper, index);
-			}
-		};
-		connect(mapper->tableView,			&QTableView::doubleClicked,		this,	openFunction);
+		auto handlerFunction = &MainWindow::handle_editSelectedItem;
+		if (mapper->type == ItemTypeAscent) {
+			handlerFunction = &MainWindow::handle_viewSelectedItem;
+		}
+		connect(mapper->tableView,			&QTableView::doubleClicked,		this,	handlerFunction);
+		connect(mapper->compTable,			&CompositeTable::wasResorted,	this,	&MainWindow::scrollToTopAfterSorting);
 	}
 }
 
@@ -826,6 +824,16 @@ void MainWindow::performUpdatesAfterUserAction(const ItemTypeMapper* const mappe
 	updateFilters();
 }
 
+/**
+ * Scrolls the active table to the top.
+ * 
+ * To be called after the table was sorted.
+ */
+void MainWindow::scrollToTopAfterSorting()
+{
+	getActiveMapper()->tableView->scrollToTop();
+}
+
 /**
  * Updates elements of the ascent filter bar which depend on contents of the composite tables.
  * 

src/main/main_window.h

@@ -126,6 +126,7 @@ class MainWindow : public QMainWindow, public Ui_MainWindow
 	void deleteItems(const ItemTypeMapper* const mapper, QSet<ViewRowIndex> viewRowIndices);
 	// Helpers
 	void performUpdatesAfterUserAction(const ItemTypeMapper* const mapper, bool numberOfEntriesChanged, BufferRowIndex bufferRowToSelectIndex = BufferRowIndex());
+	void scrollToTopAfterSorting();
 	void updateFilters(const ItemTypeMapper* mapper = nullptr);
 public:
 	void updateSelectionAfterUserAction(const ItemTypeMapper* const mapper, ViewRowIndex viewRowIndex);