diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2021-09-10 16:36:13 +0200 |
---|---|---|
committer | Christian Göttsche <cgzones@googlemail.com> | 2021-12-09 17:52:00 +0100 |
commit | 5c8670717a70863f22a8ed3c77ab9f9fbe6ee40e (patch) | |
tree | 1fcf1123b274d471da36e512ad045e536f521437 /Header.c | |
parent | bc08c7dc2aa933385fb35df9f81ba06b111ac0c6 (diff) |
Do not leave empty last column in header
Do not leave empty last column in header meters by refactoring the width
and separator logic.
Closes: #784
Diffstat (limited to 'Header.c')
-rw-r--r-- | Header.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -194,7 +194,8 @@ void Header_draw(const Header* this) { for (int y = 0; y < height; y++) { mvhline(y, 0, ' ', COLS); } - const int width = COLS - pad; + const int numCols = HeaderLayout_getColumns(this->headerLayout); + const int width = COLS - 2 * pad - (numCols - 1); int x = pad; float roundingLoss = 0.0F; @@ -217,6 +218,7 @@ void Header_draw(const Header* this) { except for multi column meters. */ if (meter->mode == TEXT_METERMODE && !Meter_isMultiColumn(meter)) { for (int j = 1; j < meter->columnWidthCount; j++) { + actualWidth++; /* separator column */ actualWidth += (float)width * HeaderLayout_layouts[this->headerLayout].widths[col + j] / 100.0F; } } @@ -227,6 +229,7 @@ void Header_draw(const Header* this) { } x += floorf(colWidth); + x++; /* separator column */ } } |