From 033522ccc30bd30d3f2c669efc60da6fd73abc92 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 5 May 2022 20:38:56 +0300 Subject: Autocommit at 05.05.2022 @ 20:38 --- src/ConsoleInterface/Menu.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/ConsoleInterface/Menu.cpp') diff --git a/src/ConsoleInterface/Menu.cpp b/src/ConsoleInterface/Menu.cpp index 4ecf236..e216d28 100644 --- a/src/ConsoleInterface/Menu.cpp +++ b/src/ConsoleInterface/Menu.cpp @@ -51,25 +51,24 @@ void Menu::navigate() const { while (buffer != 0) { printTitle(title); + switch(msgType) { + case Error: printError(msg.get_cstr()); msgType = NoPrint; break; + case Warning: printWarning(msg.get_cstr()); msgType = NoPrint; break; + case Success: printSuccess(msg.get_cstr()); msgType = NoPrint; break; + case NoPrint: printLine(""); break; + } + printLine(""); resetOrderedList(0); printOrderedListElem("Go Back"); for (unsigned i = 0; i < menuOptions.get_count(); i++) printOrderedListElem(menuOptions[i].get_nameInMenu()); - if (msgType != NoPrint) { - switch(msgType) { - case Error: printError(msg.get_cstr()); break; - case Warning: printWarning(msg.get_cstr()); break; - case Success: printSuccess(msg.get_cstr()); break; - } - msgType = NoPrint; - } - - _printInputBoxLabel("Execute No [0-"); + _printAltInputBoxLabel("Execute No [0-"); print(menuOptions.get_count()); print("]: "); read(buffer); + printLine(""); if (buffer > menuOptions.get_count()) registerError("Invalid menu option!"); -- cgit v1.3.1-23-gd82d