LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI: Preserve correct child order in FileSystemModel

Browse Source 
When handling child creation in FileSystemModel, the new child should
be inserted such that the children still follow the correct order of
being grouped by directory-and-file and then sorted alphabetically,
instead of just being appended at the end.
This commit is contained in:
Adam Harald Jørgensen 2023-10-16 11:23:02 +02:00 committed by Andreas Kling
parent c25538b2e3
commit cbfa363b2b
Notes: sideshowbarker 2024-07-17 03:03:44 +09:00 
Author: https://github.com/adamjoer
Commit: https://github.com/SerenityOS/serenity/commit/cbfa363b2b
Pull-request: https://github.com/SerenityOS/serenity/pull/21502
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Userland/Libraries/LibGUI/FileSystemModel.cpp
View File

@ -415,18 +415,33 @@ void FileSystemModel::handle_file_event(Core::FileWatcherEvent const& event)
break; break;
} }
int child_count = parent->m_children.size();
auto& mutable_parent = const_cast<Node&>(*parent); auto& mutable_parent = const_cast<Node&>(*parent);
auto maybe_child = mutable_parent.create_child(child_name); auto maybe_child = mutable_parent.create_child(child_name);
if (!maybe_child) if (!maybe_child)
break; break;
begin_insert_rows(parent->index(0), child_count, child_count);
auto child = maybe_child.release_nonnull(); auto child = maybe_child.release_nonnull();
bool const is_new_child_dir = S_ISDIR(child->mode);
int insert_index = 0;
for (auto const& other_child : mutable_parent.m_children) {
bool const is_other_child_dir = S_ISDIR(other_child->mode);
if (!is_new_child_dir && is_other_child_dir) {
++insert_index;
continue;
}
if (is_new_child_dir && !is_other_child_dir)
break;
if (other_child->name.view() > child_name)
break;
++insert_index;
}
begin_insert_rows(parent->index(0), insert_index, insert_index);
mutable_parent.total_size += child->size; mutable_parent.total_size += child->size;
mutable_parent.m_children.append(move(child)); mutable_parent.m_children.insert(insert_index, move(child));
end_insert_rows(); end_insert_rows();
break; break;