From 70bc8cffb4be7bf5331c849ade643d9ec7c8316a Mon Sep 17 00:00:00 2001 From: localhorst Date: Fri, 30 Sep 2022 21:20:23 +0200 Subject: [PATCH] two lines per entry --- src/reHDD.cpp | 1 - src/tui.cpp | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/reHDD.cpp b/src/reHDD.cpp index b38be3f..9f359b6 100644 --- a/src/reHDD.cpp +++ b/src/reHDD.cpp @@ -122,7 +122,6 @@ void reHDD::ThreadCheckFrozenDrives() { if(it->state == Drive::SHRED_ACTIVE) { - it->checkFrozenDrive(); } } diff --git a/src/tui.cpp b/src/tui.cpp index 8cd84e1..ed0972b 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -9,8 +9,8 @@ static std::mutex mxUIrefresh; -TUI::TUI(void) -{ +TUI::TUI(void){ + } /** @@ -61,7 +61,7 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) refresh(); - overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3)); + overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY)); wrefresh(overview); systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 )); @@ -167,7 +167,13 @@ void TUI::updateTUI(list * plistDrives, uint8_t u8SelectedEntry) break; } - WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 5, 3, (5* (u8Index) )+3, (distance(plistDrives->begin(), it)+1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry); + uint16_t u16StartOffsetY = (6 * (u8Index)); + + if(u8Index == 0){ + u16StartOffsetY = u16StartOffsetY + 2; + } + + WINDOW * tmp = createEntryWindow( ((int)(u16StdscrX/3) - 2), 4, 3, u16StartOffsetY, (distance(plistDrives->begin(), it)+1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry); wrefresh(tmp); u8Index++; }//end loop though drives @@ -245,7 +251,7 @@ void TUI::centerTitle(WINDOW *pwin, const char * title) WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize) { WINDOW *newWindow; - newWindow = newwin(iYSize, iXSize, 2, 2); + newWindow = newwin(iYSize, iXSize, 1, 2); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW)); box(newWindow, ACS_VLINE, ACS_HLINE); @@ -258,7 +264,7 @@ WINDOW* TUI::createOverViewWindow( int iXSize, int iYSize) WINDOW* TUI::createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive) { WINDOW *newWindow; - newWindow = newwin(iYSize, iXSize, 2, iXStart); + newWindow = newwin(iYSize, iXSize, 1, iXStart); wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_DETAIL)); box(newWindow, ACS_VLINE, ACS_HLINE);