From: John Hodge Date: Mon, 22 Aug 2011 12:58:39 +0000 (+0800) Subject: Fixed price display X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=6d296fbff71ecee2f73e3e5ba8bcf06e446dc39b;p=tpg%2Fopendispense2.git Fixed price display --- diff --git a/src/client/main.c b/src/client/main.c index b71975a..8c4237e 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -854,7 +854,7 @@ int ShowNCursesUI(void) int ch; int i, times; int xBase, yBase; - const int displayMinWidth = 40; + const int displayMinWidth = 50; char *titleString = "Dispense"; int items_in_view; int maxItemIndex; @@ -1112,7 +1112,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) if( Width > 0 ) { // 4 preceding, 5 price - int nameWidth = Width - 4 - 5; + int nameWidth = Width - 4 - 4 - snprintf(NULL, 0, "%i", price/100); move( Row, Col ); if( Index >= 0 ) @@ -1136,17 +1136,9 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted) break; } - if( price > 100*100 ) { - nameWidth --; - } - if( price > 1000*100 ) { - nameWidth --; - } - printw("%-*.*s", nameWidth, nameWidth, name); - // 99.99 should be enough - printw(" %4i", price); + printw(" %i.%02i", price/100, price%100); } else {