Add getSelectionRange to UIAbstractTableView and UITreeView.

Author: SpartanJ

include/eepp/ui/abstract/uiabstracttableview.hpp

@@ -42,6 +42,9 @@ class EE_API UIAbstractTableView : public UIAbstractView {
 
 	virtual void selectAll();
 
+	virtual std::vector<ModelIndex> getSelectionRange( const ModelIndex& start,
+													   const ModelIndex& end ) const;
+
 	const Float& getDragBorderDistance() const;
 
 	void setDragBorderDistance( const Float& dragBorderDistance );

include/eepp/ui/models/modelselection.hpp

@@ -73,6 +73,13 @@ class EE_API ModelSelection {
 		return *mIndexes.begin();
 	}
 
+	ModelIndex last() const {
+		Lock l( mMutex );
+		if ( mIndexes.empty() )
+			return {};
+		return mIndexes.back();
+	}
+
 	void removeAllMatching( std::function<bool( ModelIndex const& )> filter );
 
 	template <typename Function> void changeFromModel( Function f ) {

include/eepp/ui/uitreeview.hpp

@@ -149,6 +149,9 @@ class EE_API UITreeView : public UIAbstractTableView {
 
 	virtual size_t getItemCount() const;
 
+	std::vector<ModelIndex> getSelectionRange( const ModelIndex& start,
+											   const ModelIndex& end ) const override;
+
 	UITreeView::MetadataForIndex& getIndexMetadata( const ModelIndex& index ) const;
 
 	virtual void onColumnSizeChange( const size_t& colIndex, bool fromUserInteraction = false );

src/eepp/ui/abstract/uiabstracttableview.cpp

@@ -111,6 +111,19 @@ void UIAbstractTableView::selectAll() {
 	}
 }
 
+std::vector<ModelIndex> UIAbstractTableView::getSelectionRange( const ModelIndex& start,
+																const ModelIndex& end ) const {
+	std::vector<ModelIndex> range;
+	if ( !getModel() )
+		return range;
+	int minRow = eemin( start.row(), end.row() );
+	int maxRow = eemax( start.row(), end.row() );
+	for ( int i = minRow; i <= maxRow; ++i ) {
+		range.push_back( getModel()->index( i, start.column() ) );
+	}
+	return range;
+}
+
 size_t UIAbstractTableView::getItemCount() const {
 	if ( !getModel() )
 		return 0;
@@ -507,17 +520,34 @@ UITableRow* UIAbstractTableView::createRow() {
 			return;
 		auto index = event->getNode()->asType<UITableRow>()->getCurIndex();
 		if ( mSelectionKind == SelectionKind::Single &&
-			 getInput()->getSanitizedModState() & KeyMod::getDefaultModifier() ) {
+			 ( getInput()->getSanitizedModState() & KeyMod::getDefaultModifier() ) ) {
 			getSelection().remove( index );
 		} else {
 			if ( mSelectionKind == SelectionKind::Multiple &&
-				 getInput()->getSanitizedModState() & KeyMod::getDefaultModifier() ) {
+				 ( getInput()->getSanitizedModState() & KeyMod::getDefaultModifier() ) ) {
 				getSelection().toggle( index );
+			} else if ( mSelectionKind == SelectionKind::Multiple &&
+						( getInput()->getSanitizedModState() & KEYMOD_SHIFT ) &&
+						!getSelection().isEmpty() ) {
+				getSelection().set( getSelectionRange( getSelection().first(), index ) );
+			} else if ( mSelectionKind == SelectionKind::Multiple ) {
+				if ( !getSelection().contains( index ) )
+					getSelection().set( index );
 			} else {
 				getSelection().set( index );
 			}
 		}
 	} );
+	rowWidget->on( Event::MouseClick, [this]( const Event* event ) {
+		if ( !( event->asMouseEvent()->getFlags() & ( EE_BUTTON_LMASK | EE_BUTTON_RMASK ) ) ||
+			 !isRowSelection() )
+			return;
+
+		auto index = event->getNode()->asType<UITableRow>()->getCurIndex();
+		if ( 0 == getInput()->getSanitizedModState() ) {
+			getSelection().set( index );
+		}
+	} );
 	onRowCreated( rowWidget );
 	return rowWidget;
 }

src/eepp/ui/uitreeview.cpp

@@ -105,6 +105,36 @@ size_t UITreeView::getItemCount() const {
 	return count;
 }
 
+std::vector<ModelIndex> UITreeView::getSelectionRange( const ModelIndex& start,
+													   const ModelIndex& end ) const {
+	std::vector<ModelIndex> range;
+	if ( !getModel() )
+		return range;
+
+	bool foundStart = false;
+	traverseTree( [&]( const int&, const ModelIndex& index, const size_t&, const Float& ) {
+		bool isStart = index == start;
+		bool isEnd = index == end;
+
+		if ( isStart || isEnd ) {
+			if ( !foundStart ) {
+				foundStart = true;
+				range.push_back( index );
+				if ( start == end )
+					return IterationDecision::Stop;
+			} else {
+				range.push_back( index );
+				return IterationDecision::Stop;
+			}
+		} else if ( foundStart ) {
+			range.push_back( index );
+		}
+		return IterationDecision::Continue;
+	} );
+
+	return range;
+}
+
 void UITreeView::onColumnSizeChange( const size_t& colIndex, bool fromUserInteraction ) {
 	UIAbstractTableView::onColumnSizeChange( colIndex, fromUserInteraction );
 	updateContentSize();