zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 04:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Separate tree and list sort orders

Browse Source 
Implements the suggestion from https://github.com/htop-dev/htop/issues/399#issuecomment-747861013

Thanks to the refactors from 0bd5c8fb5da and 6393baa74e5, this was really easy
and clean to do.

It maintains the "Tree view always by PID" option in the Settings, which
results in some specific behaviors such as "clicking on the column header to
exit tree view" and "picking a new sort order to exit tree view", for the sake
of the muscle memory of long time htop users. :)
This commit is contained in:
Hisham Muhammad
2020-12-18 11:03:31 -03:00
committed by BenBE
parent e8c6994f40
commit 2327260ee8
7 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Action.c
View File

@ -158,11 +158,7 @@ static bool collapseIntoParent(Panel* panel) {
}
Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey) {
settings->sortKey = sortKey;
settings->direction = 1;
if (settings->treeViewAlwaysByPID) {
settings->treeView = false;
}
Settings_setSortKey(settings, sortKey);
return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_UPDATE_PANELHDR | HTOP_KEEP_FOLLOWING;
}
@ -174,7 +170,7 @@ static Htop_Reaction sortBy(State* st) {
for (int i = 0; fields[i]; i++) {
char* name = String_trim(Process_fields[fields[i]].name);
Panel_add(sortPanel, (Object*) ListItem_new(name, fields[i]));
if (fields[i] == st->settings->sortKey)
if (fields[i] == Settings_getActiveSortKey(st->settings))
Panel_setSelected(sortPanel, i);
free(name);
@ -234,7 +230,7 @@ static Htop_Reaction actionToggleMergedCommand(State* st) {
static Htop_Reaction actionToggleTreeView(State* st) {
st->settings->treeView = !st->settings->treeView;
if (st->settings->treeView) {
st->settings->direction = 1;
st->settings->treeDirection = 1;
}
ProcessList_expandTree(st->pl);