From e3862aa67e37ecef0eb8f82ba1f4a710ffac9c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Wed, 16 Dec 2020 21:46:11 +0100 Subject: Rework drawing of FunctionBar Draw the FunctionBar within Panel_draw instead of manually throughout the code. Add an optional PanelClass function drawFunctionBar, to allow specific panels to override the default FunctionBar_draw call. Rework the code on color change, to really change all colors (selection markers and panel headers). Closes: #402 --- MetersPanel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'MetersPanel.c') diff --git a/MetersPanel.c b/MetersPanel.c index 7e20be0f..dc2c43b3 100644 --- a/MetersPanel.c +++ b/MetersPanel.c @@ -55,13 +55,12 @@ void MetersPanel_setMoving(MetersPanel* this, bool moving) { selected->moving = moving; } if (!moving) { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]); + Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS); Panel_setDefaultBar(super); } else { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOLLOW]); + Panel_setSelectionColor(super, PANEL_SELECTION_FOLLOW); super->currentBar = Meters_movingBar; } - FunctionBar_draw(this->super.currentBar); } static inline bool moveToNeighbor(MetersPanel* this, MetersPanel* neighbor, int selected) { -- cgit v1.2.3