Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Keep views selection/s on file system events.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-01-26 18:00:21 -03:00
parent 16a17548de
commit a6ad0eb881
4 changed files with 122 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/eepp/ui/models/filesystemmodel.hpp
View File

@@ -98,6 +98,12 @@ class EE_API FileSystemModel : public Model {
Node* findChildName( const std::string& name, const FileSystemModel& model,
bool forceRefresh = false );
Int64 findChildRowFromInternalData( void* internalData, const FileSystemModel& model,
bool forceRefresh = false );
Int64 findChildRowFromName( const std::string& name, const FileSystemModel& model,
bool forceRefresh = false );
private:
friend class FileSystemModel;

7
include/eepp/ui/models/modelselection.hpp
View File

@@ -32,6 +32,7 @@ class EE_API ModelSelection {
}
void set( const ModelIndex& );
void set( const std::vector<ModelIndex>& indexes, bool notify = true );
void add( const ModelIndex& );
void toggle( const ModelIndex& );
bool remove( const ModelIndex& );
@@ -48,10 +49,10 @@ class EE_API ModelSelection {
}
std::vector<ModelIndex> indexes() const {
std::vector<ModelIndex> selectedIndexes;
std::vector<ModelIndex> indexes;
for ( auto& index : mIndexes )
selectedIndexes.push_back( index );
return selectedIndexes;
indexes.push_back( index );
return indexes;
}
ModelIndex first() const {

108
src/eepp/ui/models/filesystemmodel.cpp
View File

@@ -57,6 +57,32 @@ FileSystemModel::Node* FileSystemModel::Node::findChildName( const std::string&
return nullptr;
}
Int64 FileSystemModel::Node::findChildRowFromInternalData( void* internalData,
const FileSystemModel& model,
bool forceRefresh ) {
if ( forceRefresh )
refreshIfNeeded( model );
for ( size_t i = 0; i < mChildren.size(); i++ ) {
if ( &mChildren[i] == internalData ) {
return i;
}
}
return -1;
}
Int64 FileSystemModel::Node::findChildRowFromName( const std::string& name,
const FileSystemModel& model,
bool forceRefresh ) {
if ( forceRefresh )
refreshIfNeeded( model );
for ( size_t i = 0; i < mChildren.size(); i++ ) {
if ( mChildren[i].getName() == name ) {
return i;
}
}
return -1;
}
FileSystemModel::Node FileSystemModel::Node::createChild( const std::string& childName,
const FileSystemModel& model ) {
std::string childPath( mInfo.getDirectoryPath() + childName );
@@ -485,14 +511,14 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
if ( childNodeExists )
return;
Node childNode = parent->createChild( file.getFilepath(), *this );
Node childNode = parent->createChild( file.getFileName(), *this );
if ( !childNode.getName().empty() ) {
size_t pos = getFileIndex( parent, file );
beginInsertRows( parent->index( *this, 0 ), pos, pos );
if ( pos == SIZE_MAX ) {
if ( pos >= parent->mChildren.size() ) {
parent->mChildren.emplace_back( std::move( childNode ) );
} else {
parent->mChildren.insert( parent->mChildren.begin() + pos,
@@ -500,6 +526,24 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
}
endInsertRows();
forEachView( [&]( UIAbstractView* view ) {
std::vector<ModelIndex> newIndexes;
view->getSelection().forEachIndex( [&]( ModelIndex& index ) {
Node* curNode = static_cast<Node*>( index.internalData() );
if ( curNode->getParent() == parent ) {
if ( index.row() >= (Int64)pos ) {
newIndexes.emplace_back( this->index(
index.row() + 1, index.column(), index.parent() ) );
} else {
newIndexes.emplace_back( index );
}
} else {
newIndexes.emplace_back( index );
}
} );
view->getSelection().set( newIndexes, false );
} );
} else {
return;
}
@@ -521,6 +565,8 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
if ( !index.isValid() )
return;
Int64 pos = index.row();
beginDeleteRows( index.parent(), index.row(), index.row() );
parent->mChildren.erase( parent->mChildren.begin() + index.row() );
@@ -531,6 +577,23 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
view->getSelection().removeAllMatching( [&]( auto& selectionIndex ) {
return selectionIndex.internalData() == index.internalData();
} );
std::vector<ModelIndex> newIndexes;
view->getSelection().forEachIndex( [&]( ModelIndex& index ) {
if ( !index.isValid() )
return;
Node* curNode = static_cast<Node*>( index.internalData() );
if ( curNode->getParent() == parent ) {
if ( index.row() >= (Int64)pos ) {
newIndexes.emplace_back(
this->index( index.row() - 1, index.column(), index.parent() ) );
} else {
newIndexes.emplace_back( index );
}
} else {
newIndexes.emplace_back( index );
}
} );
view->getSelection().set( newIndexes, false );
} );
break;
@@ -566,10 +629,29 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
beginMoveRows( index.parent(), index.row(), index.row(), index.parent(),
pos );
parent->mChildren.erase( parent->mChildren.begin() + index.row() );
Node childNode = parent->createChild( file.getFilepath(), *this );
std::map<UIAbstractView*, std::vector<ModelIndex>> keptSelections;
std::map<UIAbstractView*, std::vector<std::string>> prevSelections;
std::map<UIAbstractView*, std::vector<ModelIndex>> prevSelectionsModelIndex;
if ( pos == SIZE_MAX ) {
forEachView( [&]( UIAbstractView* view ) {
view->getSelection().forEachIndex( [&]( ModelIndex& index ) {
Node* curNode = static_cast<Node*>( index.internalData() );
if ( curNode->mParent == parent ) {
prevSelectionsModelIndex[view].emplace_back( index );
prevSelections[view].emplace_back(
( curNode->getName() == event.oldFilename )
? event.filename
: curNode->getName() );
} else {
keptSelections[view].emplace_back( index );
}
} );
} );
parent->mChildren.erase( parent->mChildren.begin() + index.row() );
Node childNode = parent->createChild( file.getFileName(), *this );
if ( pos >= parent->mChildren.size() ) {
parent->mChildren.emplace_back( std::move( childNode ) );
} else {
parent->mChildren.insert( parent->mChildren.begin() + pos,
@@ -578,6 +660,22 @@ void FileSystemModel::handleFileEvent( const FileEvent& event ) {
if ( pos != SIZE_MAX )
endMoveRows();
forEachView( [&]( UIAbstractView* view ) {
std::vector<std::string> names = prevSelections[view];
std::vector<ModelIndex> newIndexes = keptSelections[view];
int i = 0;
for ( const auto& name : names ) {
size_t row = parent->findChildRowFromName( name, *this );
if ( row >= 0 ) {
newIndexes.emplace_back(
this->index( row, prevSelectionsModelIndex[view][i].column(),
prevSelectionsModelIndex[view][i].parent() ) );
}
++i;
}
view->getSelection().set( newIndexes, false );
} );
} else {
handleFileEvent(
{ FileSystemEventType::Add, event.directory, event.filename } );

9
src/eepp/ui/models/modelselection.cpp
View File

@@ -23,6 +23,15 @@ void ModelSelection::set( const ModelIndex& index ) {
mView->notifySelectionChange();
}
void ModelSelection::set( const std::vector<ModelIndex>& indexes, bool notify ) {
for ( auto& index : indexes )
eeASSERT( index.isValid() );
mIndexes.clear();
mIndexes = indexes;
if ( notify )
mView->notifySelectionChange();
}
void ModelSelection::add( const ModelIndex& index ) {
eeASSERT( index.isValid() );
auto contains = std::find( mIndexes.begin(), mIndexes.end(), index );