liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5587 from rfranke/issue3198

Browse Source 
Expand subfolders in directory browser when opening folder

PR #5587
Closes #3198
This commit is contained in:
Beep6581 2020-01-24 18:31:00 +01:00 committed by GitHub
commit 227c2fbba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
rtgui/dirbrowser.cc
View File

@ -293,36 +293,32 @@ void DirBrowser::row_expanded (const Gtk::TreeModel::iterator& iter, const Gtk::
auto dir = Gio::File::create_for_path (iter->get_value (dtColumns.dirname)); auto dir = Gio::File::create_for_path (iter->get_value (dtColumns.dirname));
auto subDirs = listSubDirs (dir, options.fbShowHidden); auto subDirs = listSubDirs (dir, options.fbShowHidden);
if (subDirs.empty()) { Gtk::TreeNodeChildren children = iter->children();
dirtree->collapse_row(path); std::list<Gtk::TreeIter> forErase(children.begin(), children.end());
} else {
Gtk::TreeNodeChildren children = iter->children();
std::list<Gtk::TreeIter> forErase(children.begin(), children.end());
std::sort (subDirs.begin (), subDirs.end (), [] (const Glib::ustring& firstDir, const Glib::ustring& secondDir) std::sort (subDirs.begin (), subDirs.end (), [] (const Glib::ustring& firstDir, const Glib::ustring& secondDir)
{ {
switch (options.dirBrowserSortType) { switch (options.dirBrowserSortType) {
default: default:
case Gtk::SORT_ASCENDING: case Gtk::SORT_ASCENDING:
return firstDir < secondDir; return firstDir < secondDir;
case Gtk::SORT_DESCENDING: case Gtk::SORT_DESCENDING:
return firstDir > secondDir; return firstDir > secondDir;
}
});
for (auto it = subDirs.begin(), end = subDirs.end(); it != end; ++it) {
addDir(iter, *it);
} }
});
for (auto it = forErase.begin(), end = forErase.end(); it != end; ++it) { for (auto it = subDirs.begin(), end = subDirs.end(); it != end; ++it) {
dirTreeModel->erase(*it); addDir(iter, *it);
}
dirTreeModel->set_sort_column(prevSortColumn, prevSortType);
expandSuccess = true;
} }
for (auto it = forErase.begin(), end = forErase.end(); it != end; ++it) {
dirTreeModel->erase(*it);
}
dirTreeModel->set_sort_column(prevSortColumn, prevSortType);
expandSuccess = true;
Glib::RefPtr<Gio::FileMonitor> monitor = dir->monitor_directory (); Glib::RefPtr<Gio::FileMonitor> monitor = dir->monitor_directory ();
iter->set_value (dtColumns.monitor, monitor); iter->set_value (dtColumns.monitor, monitor);
monitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &DirBrowser::file_changed), iter, dir->get_parse_name())); monitor->signal_changed().connect (sigc::bind(sigc::mem_fun(*this, &DirBrowser::file_changed), iter, dir->get_parse_name()));
@ -383,8 +379,10 @@ void DirBrowser::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewC
Glib::ustring dname = dirTreeModel->get_iter (path)->get_value (dtColumns.dirname); Glib::ustring dname = dirTreeModel->get_iter (path)->get_value (dtColumns.dirname);
if (Glib::file_test (dname, Glib::FILE_TEST_IS_DIR)) if (Glib::file_test (dname, Glib::FILE_TEST_IS_DIR)) {
dirSelectionSignal (dname, Glib::ustring()); dirSelectionSignal (dname, Glib::ustring());
dirtree->expand_row(path, false);
}
} }
Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath) Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath)