diff options
author | Daniel Lange <DLange@git.local> | 2022-04-14 16:44:51 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2022-04-14 16:44:51 +0200 |
commit | 99aa906bc5a61c71275bef7c7a2e94c0c3a017f3 (patch) | |
tree | f266eac5c4d74ea77d4555801912b89ac01d9673 | |
parent | df955c8991949334c72d33c8349646d4301edbce (diff) | |
parent | c6f946edd259e4222d6910d16ceaa5db60972819 (diff) |
Merge branch 'improve-filter-label' into main
-rw-r--r-- | CommandLine.c | 2 | ||||
-rw-r--r-- | MainPanel.c | 7 | ||||
-rw-r--r-- | MainPanel.h | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/CommandLine.c b/CommandLine.c index bee46495..d21f4821 100644 --- a/CommandLine.c +++ b/CommandLine.c @@ -349,7 +349,7 @@ int CommandLine_run(const char* name, int argc, char** argv) { MainPanel* panel = MainPanel_new(); ProcessList_setPanel(pl, (Panel*) panel); - MainPanel_updateTreeFunctions(panel, settings->ss->treeView); + MainPanel_updateLabels(panel, settings->ss->treeView, flags.commFilter); State state = { .settings = settings, diff --git a/MainPanel.c b/MainPanel.c index aeabe753..44915dfd 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -24,9 +24,10 @@ in the source distribution for its full text. static const char* const MainFunctions[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", "Nice -", "Nice +", "Kill ", "Quit ", NULL}; static const char* const MainFunctions_ro[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", " ", " ", " ", "Quit ", NULL}; -void MainPanel_updateTreeFunctions(MainPanel* this, bool mode) { +void MainPanel_updateLabels(MainPanel* this, bool list, bool filter) { FunctionBar* bar = MainPanel_getFunctionBar(this); - FunctionBar_setLabel(bar, KEY_F(5), mode ? "List " : "Tree "); + FunctionBar_setLabel(bar, KEY_F(5), list ? "List " : "Tree "); + FunctionBar_setLabel(bar, KEY_F(4), filter ? "FILTER" : "Filter"); } static void MainPanel_pidSearch(MainPanel* this, int ch) { @@ -122,7 +123,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { } if (reaction & HTOP_REDRAW_BAR) { - MainPanel_updateTreeFunctions(this, settings->ss->treeView); + MainPanel_updateLabels(this, settings->ss->treeView, this->state->pl->incFilter); } if (reaction & HTOP_RESIZE) { result |= RESIZE; diff --git a/MainPanel.h b/MainPanel.h index 04f4c0a8..bd22acd0 100644 --- a/MainPanel.h +++ b/MainPanel.h @@ -32,7 +32,8 @@ typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg); #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar) -void MainPanel_updateTreeFunctions(MainPanel* this, bool mode); +// update the Label Keys in the MainPanel bar, list: list / tree mode, filter: filter (inc) active / inactive +void MainPanel_updateLabels(MainPanel* this, bool list, bool filter); int MainPanel_selectedPid(MainPanel* this); |