diff --git a/plugins/autotrade.cpp b/plugins/autotrade.cpp index 46b5663db..b2cc4cdc2 100644 --- a/plugins/autotrade.cpp +++ b/plugins/autotrade.cpp @@ -422,7 +422,7 @@ struct trade_hook : public df::viewscreen_dwarfmodest int left_margin = dims.menu_x1 + 1; int x = left_margin; int y = dims.y2 - 4; - OutputToggleString(x, y, "Auto trade", "Shift-T", monitor.isMonitored(sp), true, left_margin); + OutputToggleString(x, y, "Auto trade", "T", monitor.isMonitored(sp), true, left_margin, COLOR_WHITE, COLOR_LIGHTRED); } }; diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp index 235ecb873..356cc44e7 100644 --- a/plugins/stocks.cpp +++ b/plugins/stocks.cpp @@ -1378,7 +1378,7 @@ struct stocks_stockpile_hook : public df::viewscreen_dwarfmodest int x = left_margin; int y = dims.y2 - 5; - OutputHotkeyString(x, y, "Show Inventory", "i", true, left_margin); + OutputHotkeyString(x, y, "Show Inventory", "i", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED); } }; diff --git a/plugins/uicommon.h b/plugins/uicommon.h index 6854c7b19..1daabf4c7 100644 --- a/plugins/uicommon.h +++ b/plugins/uicommon.h @@ -133,10 +133,11 @@ void OutputFilterString(int &x, int &y, const char *text, const char *hotkey, bo OutputString((state) ? COLOR_WHITE : COLOR_GREY, x, y, text, newline, left_margin); } -void OutputToggleString(int &x, int &y, const char *text, const char *hotkey, bool state, bool newline = true, int left_margin = 0, int8_t color = COLOR_WHITE) +void OutputToggleString(int &x, int &y, const char *text, const char *hotkey, bool state, bool newline = true, + int left_margin = 0, int8_t color = COLOR_WHITE, int8_t hotkey_color = COLOR_LIGHTGREEN) { - OutputHotkeyString(x, y, text, hotkey); - OutputString(COLOR_WHITE, x, y, ": "); + OutputHotkeyString(x, y, text, hotkey, false, 0, color, hotkey_color); + OutputString(color, x, y, ": "); if (state) OutputString(COLOR_GREEN, x, y, "On", newline, left_margin); else