From eac68f09a461fc39366ef9bc19df7952ded97787 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Tue, 11 Sep 2012 14:30:32 +0200 Subject: [PATCH] NCursesClient::show_menu: stop displaying counts in front of items --- src/ncurses.cc | 7 ++----- src/ncurses.hh | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ncurses.cc b/src/ncurses.cc index a6590431..cf2072db 100644 --- a/src/ncurses.cc +++ b/src/ncurses.cc @@ -224,16 +224,14 @@ void NCursesClient::menu_show(const memoryview& choices) { assert(m_menu == nullptr); m_choices = std::vector(choices.begin(), choices.end()); - for (int i = 0; i < m_choices.size(); ++i) - m_counts.push_back(int_to_str(i+1)); CharCount longest = 0; for (int i = 0; i < m_choices.size(); ++i) { - m_items.push_back(new_item(m_counts[i].c_str(), m_choices[i].c_str())); + m_items.push_back(new_item(m_choices[i].c_str(), "")); longest = std::max(longest, m_choices[i].length()); } m_items.push_back(nullptr); - longest += m_counts.back().length() + 2; + longest += 1; int max_x,max_y; getmaxyx(stdscr, max_y, max_x); @@ -276,7 +274,6 @@ void NCursesClient::menu_hide() free_item(item); m_menu = nullptr; m_items.clear(); - m_counts.clear(); refresh(); } diff --git a/src/ncurses.hh b/src/ncurses.hh index 96d91a2f..86766be6 100644 --- a/src/ncurses.hh +++ b/src/ncurses.hh @@ -29,7 +29,6 @@ public: private: MENU* m_menu; std::vector m_items; - std::vector m_counts; std::vector m_choices; int m_menu_fg;