do not initialize screens lazily as it doesn't make much sense

This commit is contained in:
Andrzej Rybczak
2012-09-14 00:54:48 +02:00
parent 7c3f93e211
commit 1891c1c050
41 changed files with 153 additions and 205 deletions

View File

@@ -38,7 +38,7 @@ using namespace std::placeholders;
using Global::MainHeight;
using Global::MainStartY;
SearchEngine *mySearcher = new SearchEngine;
SearchEngine *mySearcher;
namespace {//
@@ -101,7 +101,7 @@ size_t SearchEngine::StaticOptions = 20;
size_t SearchEngine::ResetButton = 16;
size_t SearchEngine::SearchButton = 15;
void SearchEngine::init()
SearchEngine::SearchEngine()
{
w = new NC::Menu<SEItem>(0, MainStartY, COLS, MainHeight, "", Config.main_color, NC::brNone);
w->setHighlightColor(Config.main_highlight_color);
@@ -111,7 +111,6 @@ void SearchEngine::init()
w->setSelectedPrefix(Config.selected_item_prefix);
w->setSelectedSuffix(Config.selected_item_suffix);
SearchMode = &SearchModes[Config.search_engine_default_search_mode];
isInitialized = 1;
}
void SearchEngine::resize()
@@ -135,9 +134,6 @@ void SearchEngine::switchTo()
return;
}
if (!isInitialized)
init();
if (myLockedScreen)
updateInactiveScreen(this);