X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.cpp;h=66754c9ffd70424573da83fcef338d56f2abc0a2;hb=9ca6ad8086995cde21a4ae247dac53de336c15ec;hp=77fa4030077b7d9bffad80eb082e049300e4cb66;hpb=7bb247564b8236e60384827137e57f328f9614f5;p=supertux.git diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index 77fa40300..66754c9ff 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -20,6 +20,7 @@ #include "control/joystickkeyboardcontroller.hpp" #include "gui/menu_item.hpp" +#include "gui/menu_manager.hpp" #include "gui/mousecursor.hpp" #include "supertux/globals.hpp" #include "supertux/mainloop.hpp" @@ -34,152 +35,6 @@ static const float MENU_REPEAT_RATE = 0.1f; extern SDL_Surface* g_screen; -std::vector Menu::last_menus; -std::list Menu::all_menus; -Menu* Menu::current_ = 0; -Menu* Menu::previous = 0; - -/* just displays a Yes/No text that can be used to confirm stuff */ -bool confirm_dialog(Surface *background, std::string text) -{ - //Surface* cap_screen = Surface::CaptureScreen(); - Menu* dialog = new Menu; - dialog->add_inactive(-1, text); - dialog->add_hl(); - dialog->add_entry(true, _("Yes")); - dialog->add_entry(false, _("No")); - dialog->add_hl(); - - Menu::set_current(dialog); - - DrawingContext context; - - // TODO make this a screen and not another mainloop... - while(true) - { - SDL_Event event; - while (SDL_PollEvent(&event)) { - if(event.type == SDL_QUIT) - g_main_loop->quit(); - g_main_controller->process_event(event); - dialog->event(event); - } - - if(background == NULL) - context.draw_gradient(Color(0.8f, 0.95f, 0.85f), Color(0.8f, 0.8f, 0.8f), - LAYER_BACKGROUND0); - else - context.draw_surface(background, Vector(0,0), LAYER_BACKGROUND0); - - dialog->draw(context); - dialog->update(); - - switch (dialog->check()) - { - case true: - //delete cap_screen; - Menu::set_current(0); - delete dialog; - return true; - break; - case false: - //delete cap_screen; - Menu::set_current(0); - delete dialog; - return false; - break; - default: - break; - } - - mouse_cursor->draw(context); - context.do_drawing(); - SDL_Delay(25); - } - - return false; -} - -void -Menu::push_current(Menu* pmenu) -{ - previous = current_; - - if (current_) - last_menus.push_back(current_); - - current_ = pmenu; - current_->effect_start_time = real_time; - current_->effect_progress = 0.0f; -} - -void -Menu::pop_current() -{ - previous = current_; - - if (last_menus.size() >= 1) { - current_ = last_menus.back(); - current_->effect_start_time = real_time; - current_->effect_progress = 0.0f; - last_menus.pop_back(); - } else { - set_current(NULL); - } -} - -void -Menu::set_current(Menu* menu) -{ - if (current_ && current_->close == true) - return; - - previous = current_; - - if (menu) { - menu->effect_start_time = real_time; - menu->effect_progress = 0.0f; - current_ = menu; - } - else if (current_) { - last_menus.clear(); //NULL new menu pointer => close all menus - current_->effect_start_time = real_time; - current_->effect_progress = 0.0f; - current_->close = true; - } - - // just to be sure... - g_main_controller->reset(); -} - -void -Menu::recalc_pos() -{ - if (current_) - current_->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2); - - for(std::list::iterator i = all_menus.begin(); i != all_menus.end(); ++i) - { - // FIXME: This is of course not quite right, since it ignores any previous set_pos() calls - (*i)->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2); - } -} - -Menu::~Menu() -{ - all_menus.remove(this); - - for(std::vector::iterator i = items.begin(); - i != items.end(); ++i) - delete *i; - - if(current_ == this) - current_ = NULL; - - if (previous == this) - previous = NULL; -} - Menu::Menu() : hit_item(), pos_x(), @@ -200,7 +55,7 @@ Menu::Menu() : arrow_left(), arrow_right() { - all_menus.push_back(this); + MenuManager::all_menus.push_back(this); hit_item = -1; menuaction = MENU_ACTION_NONE; @@ -222,6 +77,23 @@ Menu::Menu() : arrow_right.reset(new Surface("images/engine/menu/arrow-right.png")); } +Menu::~Menu() +{ + MenuManager::all_menus.remove(this); + + for(std::vector::iterator i = items.begin(); + i != items.end(); ++i) + { + delete *i; + } + + if (MenuManager::current_ == this) + MenuManager::current_ = NULL; + + if (MenuManager::previous == this) + MenuManager::previous = NULL; +} + void Menu::set_pos(float x, float y, float rw, float rh) { @@ -359,7 +231,7 @@ Menu::update() effect_progress = 1.0f; if (close) { - current_ = 0; + MenuManager::current_ = 0; close = false; } } @@ -475,7 +347,7 @@ Menu::update() switch (items[active_item]->kind) { case MN_GOTO: assert(items[active_item]->target_menu != 0); - Menu::push_current(items[active_item]->target_menu); + MenuManager::push_current(items[active_item]->target_menu); break; case MN_TOGGLE: @@ -507,7 +379,7 @@ Menu::update() break; case MN_BACK: - Menu::pop_current(); + MenuManager::pop_current(); break; default: break; @@ -542,7 +414,7 @@ Menu::update() break; case MENU_ACTION_BACK: - Menu::pop_current(); + MenuManager::pop_current(); break; case MENU_ACTION_NONE: @@ -780,13 +652,13 @@ Menu::draw(DrawingContext& context) { if (close) { - menu_width = (current_->get_width() * (1.0f - effect_progress)); - menu_height = (current_->get_height() * (1.0f - effect_progress)); + menu_width = (MenuManager::current_->get_width() * (1.0f - effect_progress)); + menu_height = (MenuManager::current_->get_height() * (1.0f - effect_progress)); } - else if (Menu::previous) + else if (MenuManager::previous) { - menu_width = (menu_width * effect_progress) + (Menu::previous->get_width() * (1.0f - effect_progress)); - menu_height = (menu_height * effect_progress) + (Menu::previous->get_height() * (1.0f - effect_progress)); + menu_width = (menu_width * effect_progress) + (MenuManager::previous->get_width() * (1.0f - effect_progress)); + menu_height = (menu_height * effect_progress) + (MenuManager::previous->get_height() * (1.0f - effect_progress)); //std::cout << effect_progress << " " << this << " " << last_menus.back() << std::endl; } else @@ -890,10 +762,10 @@ Menu::set_toggled(int id, bool toggled) Menu* Menu::get_parent() const { - if (last_menus.empty()) + if (MenuManager::last_menus.empty()) return 0; else - return last_menus.back(); + return MenuManager::last_menus.back(); } /* Check for menu event */