X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.cpp;h=0045fbc77e1b3fda8c2c0c2d39bb7a01deff095b;hb=07ddaed2a657e4d2a3d038fed223fc5827159caf;hp=94564e5d9fb25aedf485c04cf28dfd2d01f13dae;hpb=ba9907babbb17fadee52f1653f7ad6adf362c6fd;p=supertux.git diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index 94564e5d9..0045fbc77 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -1,7 +1,7 @@ // $Id$ // // SuperTux -// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -16,6 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include #include @@ -30,6 +31,7 @@ #include #include "menu.hpp" +#include "mainloop.hpp" #include "video/screen.hpp" #include "video/drawing_context.hpp" #include "gettext.hpp" @@ -37,7 +39,6 @@ #include "main.hpp" #include "resources.hpp" #include "control/joystickkeyboardcontroller.hpp" -#include "exceptions.hpp" static const int MENU_REPEAT_INITIAL = 400; static const int MENU_REPEAT_RATE = 200; @@ -45,12 +46,6 @@ static const int FLICK_CURSOR_TIME = 500; extern SDL_Surface* screen; -Surface* checkbox; -Surface* checkbox_checked; -Surface* back; -Surface* arrow_left; -Surface* arrow_right; - std::vector Menu::last_menus; Menu* Menu::current_ = 0; Font* Menu::default_font; @@ -74,12 +69,13 @@ bool confirm_dialog(Surface *background, std::string text) 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) - throw graceful_shutdown(); + main_loop->quit(); main_controller->process_event(event); dialog->event(event); } @@ -211,12 +207,18 @@ Menu::Menu() pos_y = SCREEN_HEIGHT/2; arrange_left = 0; active_item = -1; + + checkbox.reset(new Surface("images/engine/menu/checkbox-unchecked.png")); + checkbox_checked.reset(new Surface("images/engine/menu/checkbox-checked.png")); + back.reset(new Surface("images/engine/menu/arrow-back.png")); + arrow_left.reset(new Surface("images/engine/menu/arrow-left.png")); + arrow_right.reset(new Surface("images/engine/menu/arrow-right.png")); } -void Menu::set_pos(int x, int y, float rw, float rh) +void Menu::set_pos(float x, float y, float rw, float rh) { - pos_x = x + (int)((float)get_width() * rw); - pos_y = y + (int)((float)get_height() * rh); + pos_x = x + get_width() * rw; + pos_y = y + get_height() * rh; } /* Add an item to a menu */ @@ -487,8 +489,8 @@ Menu::menu_action(MenuItem* ) void Menu::draw_item(DrawingContext& context, int index) { - int menu_height = get_height(); - int menu_width = get_width(); + float menu_height = get_height(); + float menu_width = get_width(); MenuItem& pitem = *(items[index]); @@ -503,8 +505,8 @@ Menu::draw_item(DrawingContext& context, int index) } Font* text_font = default_font; - int x_pos = pos_x; - int y_pos = pos_y + 24*index - menu_height/2 + 12 + effect_offset; + float x_pos = pos_x; + float y_pos = pos_y + 24*index - menu_height/2 + 12 + effect_offset; int shadow_size = 2; int text_width = int(text_font->get_text_width(pitem.text)); int input_width = int(text_font->get_text_width(pitem.input) + 10); @@ -535,8 +537,8 @@ Menu::draw_item(DrawingContext& context, int index) case MN_HL: { // TODO - int x = pos_x - menu_width/2; - int y = y_pos - 12 - effect_offset; + float x = pos_x - menu_width/2; + float y = y_pos - 12 - effect_offset; /* Draw a horizontal line with a little 3d effect */ context.draw_filled_rect(Vector(x, y + 6), Vector(menu_width, 4), @@ -557,9 +559,9 @@ Menu::draw_item(DrawingContext& context, int index) case MN_NUMFIELD: case MN_CONTROLFIELD: { - int width = text_width + input_width + 5; - int text_pos = SCREEN_WIDTH/2 - width/2; - int input_pos = text_pos + text_width + 10; + float width = text_width + input_width + 5; + float text_pos = SCREEN_WIDTH/2 - width/2; + float input_pos = text_pos + text_width + 10; context.draw_filled_rect( Vector(input_pos - 5, y_pos - 10), @@ -600,10 +602,10 @@ Menu::draw_item(DrawingContext& context, int index) int text_pos = (text_width + 16)/2; /* Draw arrows */ - context.draw_surface(arrow_left, + context.draw_surface(arrow_left.get(), Vector(x_pos - list_pos + text_pos - 17, y_pos - 8), LAYER_GUI); - context.draw_surface(arrow_right, + context.draw_surface(arrow_right.get(), Vector(x_pos - list_pos + text_pos - 1 + list_pos_2, y_pos - 8), LAYER_GUI); @@ -630,7 +632,7 @@ Menu::draw_item(DrawingContext& context, int index) context.draw_text(text_font, pitem.text, Vector(SCREEN_WIDTH/2, y_pos - int(text_font->get_height()/2)), CENTER_ALLIGN, LAYER_GUI); - context.draw_surface(back, + context.draw_surface(back.get(), Vector(x_pos + text_width/2 + 16, y_pos - 8), LAYER_GUI); break; @@ -643,11 +645,11 @@ Menu::draw_item(DrawingContext& context, int index) CENTER_ALLIGN, LAYER_GUI); if(pitem.toggled) - context.draw_surface(checkbox_checked, + context.draw_surface(checkbox_checked.get(), Vector(x_pos + (text_width+16)/2, y_pos - 8), LAYER_GUI + 1); else - context.draw_surface(checkbox, + context.draw_surface(checkbox.get(), Vector(x_pos + (text_width+16)/2, y_pos - 8), LAYER_GUI + 1); break; @@ -666,29 +668,33 @@ Menu::draw_item(DrawingContext& context, int index) } } -int Menu::get_width() const +float Menu::get_width() const +{ + /* The width of the menu has to be more than the width of the text + with the most characters */ + float menu_width = 0; + for(unsigned int i = 0; i < items.size(); ++i) { - /* The width of the menu has to be more than the width of the text - with the most characters */ - int menu_width = 0; - for(unsigned int i = 0; i < items.size(); ++i) - { - int w = items[i]->text.size() + items[i]->input.size() + 1; - if(w > menu_width) - { - menu_width = w; - if( items[i]->kind == MN_TOGGLE) - menu_width += 2; - } - } - - return (menu_width * 16 + 24); + Font* font = default_font; + if(items[i]->kind == MN_LABEL) + font = label_font; + + float w = font->get_text_width(items[i]->text) + + label_font->get_text_width(items[i]->input) + 16; + if(items[i]->kind == MN_TOGGLE) + w += 32; + + if(w > menu_width) + menu_width = w; } + + return menu_width + 24; +} -int Menu::get_height() const - { - return items.size() * 24; - } +float Menu::get_height() const +{ + return items.size() * 24; +} /* Draw the current menu. */ void @@ -698,8 +704,8 @@ Menu::draw(DrawingContext& context) MouseCursor::current()->draw(context); } - int menu_height = get_height(); - int menu_width = get_width(); + float menu_height = get_height(); + float menu_width = get_width(); /* Draw a transparent background */ context.draw_filled_rect( @@ -777,15 +783,16 @@ Menu::event(const SDL_Event& event) case SDL_MOUSEMOTION: { - int x = int(event.motion.x * float(SCREEN_WIDTH)/screen->w); - int y = int(event.motion.y * float(SCREEN_HEIGHT)/screen->h); + float x = event.motion.x * SCREEN_WIDTH/screen->w; + float y = event.motion.y * SCREEN_HEIGHT/screen->h; if(x > pos_x - get_width()/2 && x < pos_x + get_width()/2 && y > pos_y - get_height()/2 && y < pos_y + get_height()/2) { - int new_active_item = (y - (pos_y - get_height()/2)) / 24; + int new_active_item + = static_cast ((y - (pos_y - get_height()/2)) / 24); /* only change the mouse focus to a selectable item */ if ((items[new_active_item]->kind != MN_HL)