projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't adjust aspect-ratio in non-fullscreen modes, removed a few unneeded headers
[supertux.git]
/
src
/
gui
/
menu.hpp
diff --git
a/src/gui/menu.hpp
b/src/gui/menu.hpp
index
55d97e2
..
5e85fa1
100644
(file)
--- a/
src/gui/menu.hpp
+++ b/
src/gui/menu.hpp
@@
-57,22
+57,22
@@
class MenuItem
public:
MenuItem(MenuItemKind kind, int id = -1);
MenuItemKind kind;
public:
MenuItem(MenuItemKind kind, int id = -1);
MenuItemKind kind;
- int id; // item id
+ int id; // item id
bool toggled;
std::string text;
std::string input;
bool toggled;
std::string text;
std::string input;
-
+
std::vector<std::string> list; // list of values for a STRINGSELECT item
size_t selected; // currently selected item
std::vector<std::string> list; // list of values for a STRINGSELECT item
size_t selected; // currently selected item
-
+
Menu* target_menu;
Menu* target_menu;
-
+
void change_text (const std::string& text);
void change_input(const std::string& text);
void change_text (const std::string& text);
void change_input(const std::string& text);
-
+
static MenuItem* create(MenuItemKind kind, const std::string& text,
int init_toggle, Menu* target_menu, int id, int key);
static MenuItem* create(MenuItemKind kind, const std::string& text,
int init_toggle, Menu* target_menu, int id, int key);
-
+
std::string get_input_with_symbol(bool active_item); // returns the text with an input symbol
private:
std::string get_input_with_symbol(bool active_item); // returns the text with an input symbol
private:
@@
-90,21
+90,21
@@
class Menu
private:
static std::vector<Menu*> last_menus;
static Menu* current_;
private:
static std::vector<Menu*> last_menus;
static Menu* current_;
-
+
static void pop_current();
static void pop_current();
-
+
public:
/** Set the current menu, if pmenu is NULL, hide the current menu */
static void set_current(Menu* pmenu);
public:
/** Set the current menu, if pmenu is NULL, hide the current menu */
static void set_current(Menu* pmenu);
- static void push_current(Menu* pmenu);
-
+ static void push_current(Menu* pmenu);
+
/** Return the current active menu or NULL if none is active */
static Menu* current()
{
return current_;
}
/** Return the current active menu or NULL if none is active */
static Menu* current()
{
return current_;
}
-
+
private:
/* Action done on the menu */
enum MenuAction {
private:
/* Action done on the menu */
enum MenuAction {
@@
-118,18
+118,18
@@
private:
MENU_ACTION_REMOVE,
MENU_ACTION_BACK
};
MENU_ACTION_REMOVE,
MENU_ACTION_BACK
};
-
+
/** Number of the item that got 'hit' (ie. pressed) in the last
event()/update() call, -1 if none */
int hit_item;
/** Number of the item that got 'hit' (ie. pressed) in the last
event()/update() call, -1 if none */
int hit_item;
-
+
// position of the menu (ie. center of the menu, not top/left)
float pos_x;
float pos_y;
// position of the menu (ie. center of the menu, not top/left)
float pos_x;
float pos_y;
-
+
/** input event for the menu (up, down, left, right, etc.) */
MenuAction menuaction;
/** input event for the menu (up, down, left, right, etc.) */
MenuAction menuaction;
-
+
/* input implementation variables */
int delete_character;
char mn_input_char;
/* input implementation variables */
int delete_character;
char mn_input_char;
@@
-143,10
+143,10
@@
public:
static Font* field_font;
std::vector<MenuItem*> items;
static Font* field_font;
std::vector<MenuItem*> items;
-
+
Menu();
virtual ~Menu();
Menu();
virtual ~Menu();
-
+
void add_hl();
void add_label(const std::string& text);
void add_entry(int id, const std::string& text);
void add_hl();
void add_label(const std::string& text);
void add_entry(int id, const std::string& text);
@@
-158,40
+158,40
@@
public:
const std::string& mapping = "");
virtual void menu_action(MenuItem* item);
const std::string& mapping = "");
virtual void menu_action(MenuItem* item);
-
+
void update();
void update();
-
+
/** Remove all entries from the menu */
void clear();
/** Remove all entries from the menu */
void clear();
-
+
/** Return the index of the menu item that was 'hit' (ie. the user
clicked on it) in the last event() call */
int check ();
/** Return the index of the menu item that was 'hit' (ie. the user
clicked on it) in the last event() call */
int check ();
-
+
MenuItem& get_item(int index)
{
return *(items[index]);
}
MenuItem& get_item_by_id(int id);
const MenuItem& get_item_by_id(int id) const;
MenuItem& get_item(int index)
{
return *(items[index]);
}
MenuItem& get_item_by_id(int id);
const MenuItem& get_item_by_id(int id) const;
-
+
int get_active_item_id();
void set_active_item(int id);
int get_active_item_id();
void set_active_item(int id);
-
- void draw(DrawingContext& context);
+
+ void draw(DrawingContext& context);
void set_pos(float x, float y, float rw = 0, float rh = 0);
void set_pos(float x, float y, float rw = 0, float rh = 0);
-
+
void event(const SDL_Event& event);
bool is_toggled(int id) const;
protected:
void event(const SDL_Event& event);
bool is_toggled(int id) const;
protected:
- void additem(MenuItem* pmenu_item);
+ void additem(MenuItem* pmenu_item);
float get_width() const;
float get_height() const;
private:
float get_width() const;
float get_height() const;
private:
- void check_controlfield_change_event(const SDL_Event& event);
+ void check_controlfield_change_event(const SDL_Event& event);
void draw_item(DrawingContext& context, int index);
float effect_time;
int arrange_left;
void draw_item(DrawingContext& context, int index);
float effect_time;
int arrange_left;