mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-30 09:06:17 +13:00
Merge pull request #88 from jlopezcur/fix_vim-keys-typo
fix: when vim keys [k]ill should be [K]ill
This commit is contained in:
commit
070691d5d0
1 changed files with 3 additions and 2 deletions
|
@ -1104,6 +1104,7 @@ namespace Proc {
|
||||||
auto& graph_symbol = (tty_mode ? "tty" : Config::getS("graph_symbol_proc"));
|
auto& graph_symbol = (tty_mode ? "tty" : Config::getS("graph_symbol_proc"));
|
||||||
auto& graph_bg = Symbols::graph_symbols.at((graph_symbol == "default" ? Config::getS("graph_symbol") + "_up" : graph_symbol + "_up")).at(6);
|
auto& graph_bg = Symbols::graph_symbols.at((graph_symbol == "default" ? Config::getS("graph_symbol") + "_up" : graph_symbol + "_up")).at(6);
|
||||||
auto& mem_bytes = Config::getB("proc_mem_bytes");
|
auto& mem_bytes = Config::getB("proc_mem_bytes");
|
||||||
|
auto& vim_keys = Config::getB("vim_keys");
|
||||||
start = Config::getI("proc_start");
|
start = Config::getI("proc_start");
|
||||||
selected = Config::getI("proc_selected");
|
selected = Config::getI("proc_selected");
|
||||||
const int y = show_detailed ? Proc::y + 8 : Proc::y;
|
const int y = show_detailed ? Proc::y + 8 : Proc::y;
|
||||||
|
@ -1168,7 +1169,7 @@ namespace Proc {
|
||||||
if (alive and selected == 0) Input::mouse_mappings["t"] = {d_y, mouse_x, 1, 9};
|
if (alive and selected == 0) Input::mouse_mappings["t"] = {d_y, mouse_x, 1, 9};
|
||||||
mouse_x += 11;
|
mouse_x += 11;
|
||||||
}
|
}
|
||||||
out += title_left + hi_color + Fx::b + 'k' + t_color + "ill" + Fx::ub + title_right
|
out += title_left + hi_color + Fx::b + (vim_keys ? 'K' : 'k') + t_color + "ill" + Fx::ub + title_right
|
||||||
+ title_left + hi_color + Fx::b + 's' + t_color + "ignals" + Fx::ub + title_right
|
+ title_left + hi_color + Fx::b + 's' + t_color + "ignals" + Fx::ub + title_right
|
||||||
+ Mv::to(d_y, d_x + d_width - 10) + title_left + t_color + Fx::b + hide + Symbols::enter + Fx::ub + title_right;
|
+ Mv::to(d_y, d_x + d_width - 10) + title_left + t_color + Fx::b + hide + Symbols::enter + Fx::ub + title_right;
|
||||||
if (alive and selected == 0) {
|
if (alive and selected == 0) {
|
||||||
|
@ -1261,7 +1262,7 @@ namespace Proc {
|
||||||
mouse_x += 11;
|
mouse_x += 11;
|
||||||
}
|
}
|
||||||
if (width > 55) {
|
if (width > 55) {
|
||||||
out += title_left_down + Fx::b + hi_color + 'k' + t_color + "ill" + Fx::ub + title_right_down;
|
out += title_left_down + Fx::b + hi_color + (vim_keys ? 'K' : 'k') + t_color + "ill" + Fx::ub + title_right_down;
|
||||||
if (selected > 0) Input::mouse_mappings["k"] = {y + height - 1, mouse_x, 1, 4};
|
if (selected > 0) Input::mouse_mappings["k"] = {y + height - 1, mouse_x, 1, 4};
|
||||||
mouse_x += 6;
|
mouse_x += 6;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue