#include "control/joystickkeyboardcontroller.hpp"
static const float MENU_REPEAT_INITIAL = 0.4f;
-static const float MENU_REPEAT_RATE = 0.2f;
-static const float FLICK_CURSOR_TIME = 0.5f;
+static const float MENU_REPEAT_RATE = 0.1f;
+static const float FLICK_CURSOR_TIME = 0.5f;
extern SDL_Surface* screen;
std::vector<Menu*> Menu::last_menus;
+std::list<Menu*> Menu::all_menus;
Menu* Menu::current_ = 0;
Menu* Menu::previous = 0;
Font* Menu::default_font;
Font* Menu::active_font;
-Font* Menu::deactive_font;
+Font* Menu::inactive_font;
Font* Menu::label_font;
Font* Menu::field_font;
{
//Surface* cap_screen = Surface::CaptureScreen();
Menu* dialog = new Menu;
- dialog->add_deactive(-1, text);
+ dialog->add_inactive(-1, text);
dialog->add_hl();
dialog->add_entry(true, _("Yes"));
dialog->add_entry(false, _("No"));
// just to be sure...
main_controller->reset();
}
+
+void
+Menu::recalc_pos()
+{
+ if (current_)
+ current_->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2);
+
+ for(std::list<Menu*>::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);
+ }
+}
\f
MenuItem::MenuItem(MenuItemKind _kind, int _id)
: kind(_kind) , id(_id)
\f
Menu::~Menu()
{
+ all_menus.remove(this);
+
for(std::vector<MenuItem*>::iterator i = items.begin();
i != items.end(); ++i)
delete *i;
Menu::Menu()
{
+ all_menus.push_back(this);
+
hit_item = -1;
menuaction = MENU_ACTION_NONE;
delete_character = 0;
void
Menu::set_pos(float x, float y, float rw, float rh)
{
- pos_x = x + get_width() * rw;
+ pos_x = x + get_width() * rw;
pos_y = y + get_height() * rh;
}
items.push_back(item);
/* If a new menu is being built, the active item shouldn't be set to
- * something that isnt selectable. Set the active_item to the first
- * selectable item added
+ * something that isn't selectable. Set the active_item to the first
+ * selectable item added.
*/
if (active_item == -1
&& item->kind != MN_HL
&& item->kind != MN_LABEL
- && item->kind != MN_DEACTIVE) {
+ && item->kind != MN_INACTIVE) {
active_item = items.size() - 1;
}
}
}
MenuItem*
-Menu::add_deactive(int id, const std::string& text)
+Menu::add_inactive(int id, const std::string& text)
{
- MenuItem* item = new MenuItem(MN_DEACTIVE, id);
+ MenuItem* item = new MenuItem(MN_INACTIVE, id);
item->text = text;
additem(item);
return item;
}
MenuItem*
+Menu::add_string_select(int id, const std::string& text)
+{
+ MenuItem* item = new MenuItem(MN_STRINGSELECT, id);
+ item->text = text;
+ additem(item);
+ return item;
+}
+
+MenuItem*
Menu::add_back(const std::string& text)
{
MenuItem* item = new MenuItem(MN_BACK);
void
Menu::update()
{
- int menu_height = get_height();
+ int menu_height = (int) get_height();
if (menu_height > SCREEN_HEIGHT)
{ // Scrolling
int scroll_offset = (menu_height - SCREEN_HEIGHT) / 2 + 32;
menuaction = MENU_ACTION_UP;
menu_repeat_time = real_time + MENU_REPEAT_RATE;
}
+
if(main_controller->pressed(Controller::DOWN)) {
menuaction = MENU_ACTION_DOWN;
menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
menuaction = MENU_ACTION_DOWN;
menu_repeat_time = real_time + MENU_REPEAT_RATE;
}
+
+ if(main_controller->pressed(Controller::LEFT)) {
+ menuaction = MENU_ACTION_LEFT;
+ menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
+ }
+ if(main_controller->hold(Controller::LEFT) &&
+ menu_repeat_time != 0 && real_time > menu_repeat_time) {
+ menuaction = MENU_ACTION_LEFT;
+ menu_repeat_time = real_time + MENU_REPEAT_RATE;
+ }
+
+ if(main_controller->pressed(Controller::RIGHT)) {
+ menuaction = MENU_ACTION_RIGHT;
+ menu_repeat_time = real_time + MENU_REPEAT_INITIAL;
+ }
+ if(main_controller->hold(Controller::RIGHT) &&
+ menu_repeat_time != 0 && real_time > menu_repeat_time) {
+ menuaction = MENU_ACTION_RIGHT;
+ menu_repeat_time = real_time + MENU_REPEAT_RATE;
+ }
+
if(main_controller->pressed(Controller::ACTION)
|| main_controller->pressed(Controller::MENU_SELECT)) {
menuaction = MENU_ACTION_HIT;
active_item = int(items.size())-1;
} while ((items[active_item]->kind == MN_HL
|| items[active_item]->kind == MN_LABEL
- || items[active_item]->kind == MN_DEACTIVE)
+ || items[active_item]->kind == MN_INACTIVE)
&& (active_item != last_active_item));
break;
active_item = 0;
} while ((items[active_item]->kind == MN_HL
|| items[active_item]->kind == MN_LABEL
- || items[active_item]->kind == MN_DEACTIVE)
+ || items[active_item]->kind == MN_INACTIVE)
&& (active_item != last_active_item));
break;
items[active_item]->selected--;
else
items[active_item]->selected = items[active_item]->list.size()-1;
+
+ menu_action(items[active_item]);
}
break;
items[active_item]->selected++;
else
items[active_item]->selected = 0;
+
+ menu_action(items[active_item]);
}
break;
menu_action(items[active_item]);
break;
+ case MN_STRINGSELECT:
+ if(items[active_item]->selected+1 < items[active_item]->list.size())
+ items[active_item]->selected++;
+ else
+ items[active_item]->selected = 0;
+
+ menu_action(items[active_item]);
+ break;
+
case MN_TEXTFIELD:
case MN_NUMFIELD:
menuaction = MENU_ACTION_DOWN;
{
int i = items[active_item]->input.size();
- while(delete_character > 0) /* remove charactes */
+ while(delete_character > 0) /* remove characters */
{
items[active_item]->input.resize(i-1);
delete_character--;
int text_width = int(text_font->get_text_width(pitem.text));
int input_width = int(text_font->get_text_width(pitem.input) + 10);
int list_width = 0;
+
+ float left = pos_x - menu_width/2 + 16;
+ float right = pos_x + menu_width/2 - 16;
+
if(pitem.list.size() > 0) {
list_width = (int) text_font->get_text_width(pitem.list[pitem.selected]);
}
switch (pitem.kind)
{
- case MN_DEACTIVE:
+ case MN_INACTIVE:
{
- context.draw_text(deactive_font, pitem.text,
- Vector(pos_x, y_pos - int(deactive_font->get_height()/2)),
+ context.draw_text(inactive_font, pitem.text,
+ Vector(pos_x, y_pos - int(inactive_font->get_height()/2)),
ALIGN_CENTER, LAYER_GUI);
break;
}
case MN_NUMFIELD:
case MN_CONTROLFIELD:
{
- float left = pos_x - menu_width/2 + 16;
- float right = pos_x + menu_width/2 - 16;
-
if(pitem.kind == MN_TEXTFIELD || pitem.kind == MN_NUMFIELD)
{
if(active_item == index)
}
case MN_STRINGSELECT:
{
- int list_pos_2 = list_width + 16;
- int list_pos = list_width/2;
- int text_pos = (text_width + 16)/2;
+ float roff = arrow_left->get_width();
+ // Draw left side
+ context.draw_text(text_font, pitem.text,
+ Vector(left, y_pos - int(text_font->get_height()/2)),
+ ALIGN_LEFT, LAYER_GUI);
- /* Draw arrows */
+ // Draw right side
context.draw_surface(arrow_left.get(),
- Vector(x_pos - list_pos + text_pos - 17, y_pos - 8),
+ Vector(right - list_width - roff - roff, y_pos - 8),
LAYER_GUI);
context.draw_surface(arrow_right.get(),
- Vector(x_pos - list_pos + text_pos - 1 + list_pos_2, y_pos - 8),
+ Vector(right - roff, y_pos - 8),
LAYER_GUI);
-
- /* Draw input background */
- context.draw_filled_rect(
- Vector(x_pos - list_pos + text_pos - 1, y_pos - 10),
- Vector(list_pos_2 + 2, 20),
- Color(1.0f, 1.0f, 1.0f, 1.0f), LAYER_GUI - 4);
- context.draw_filled_rect(
- Vector(x_pos - list_pos + text_pos, y_pos - 9),
- Vector(list_pos_2, 18),
- Color(0, 0, 0, 0.5f), LAYER_GUI - 5);
-
- context.draw_text(text_font, pitem.list[pitem.selected],
- Vector(pos_x + text_pos, y_pos - int(text_font->get_height()/2)),
- ALIGN_CENTER, LAYER_GUI);
- context.draw_text(text_font, pitem.text,
- Vector(pos_x + list_pos_2/2, y_pos - int(text_font->get_height()/2)),
- ALIGN_CENTER, LAYER_GUI);
+ context.draw_text(field_font, pitem.list[pitem.selected],
+ Vector(right - roff, y_pos - int(text_font->get_height()/2)),
+ ALIGN_RIGHT, LAYER_GUI);
break;
}
case MN_BACK:
if (!items[active_item]->help.empty())
{
- int text_width = default_font->get_text_width(items[active_item]->help);
- int text_height = default_font->get_text_height(items[active_item]->help);
+ int text_width = (int) default_font->get_text_width(items[active_item]->help);
+ int text_height = (int) default_font->get_text_height(items[active_item]->help);
Rect text_rect(pos_x - text_width/2 - 8,
SCREEN_HEIGHT - 48 - text_height/2 - 4,
return get_item_by_id(id).toggled;
}
+void
+Menu::set_toggled(int id, bool toggled)
+{
+ get_item_by_id(id).toggled = toggled;
+}
+
Menu*
Menu::get_parent() const
{
/* only change the mouse focus to a selectable item */
if ((items[new_active_item]->kind != MN_HL)
&& (items[new_active_item]->kind != MN_LABEL)
- && (items[new_active_item]->kind != MN_DEACTIVE))
+ && (items[new_active_item]->kind != MN_INACTIVE))
active_item = new_active_item;
if(MouseCursor::current())
projects / supertux.git / blobdiff