diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2020-12-18 11:03:31 -0300 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2020-12-19 16:02:34 +0100 |
| commit | 2327260ee888146beab3da66507c7744334a6973 (patch) | |
| tree | 06b3919321515cc4fdea7de0b5ead4744f3600ec /MainPanel.c | |
| parent | e8c6994f40c9c69089e9f80abb2f895d2e077c7e (diff) | |
Separate tree and list sort orders
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. :)
Diffstat (limited to 'MainPanel.c')
| -rw-r--r-- | MainPanel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MainPanel.c b/MainPanel.c index f2b71e68..815609f6 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -60,14 +60,15 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { Settings* settings = this->state->settings; int hx = super->scrollH + x + 1; ProcessField field = ProcessList_keyAt(pl, hx); - if (field == settings->sortKey) { + if (settings->treeView && settings->treeViewAlwaysByPID) { + settings->treeView = false; + settings->direction = 1; + reaction |= Action_setSortKey(settings, field); + } else if (field == Settings_getActiveSortKey(settings)) { Settings_invertSortOrder(settings); } else { reaction |= Action_setSortKey(settings, field); } - if (settings->treeViewAlwaysByPID) { - settings->treeView = false; - } reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_SAVE_SETTINGS; result = HANDLED; } else if (ch != ERR && this->inc->active) { |