0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added menus at top left of screen

Browse source
This commit is contained in:
uid68803 2004-01-30 23:04:39 +00:00
parent 01423d7572
commit b1f5695d1c
7 changed files with 75 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/themes/default.cfg
View file

@ -14,15 +14,24 @@ height=600
[menu]
title=main_menu
image=lite
items=objectives,unitlist,recruit,recall,statustable,endturn,quit
rect=4,2
items=speak,objectives,unitlist,recruit,recall,statustable,endturn
rect=4,2,0,24
xanchor=fixed
yanchor=fixed
[/menu]
[menu]
title=game_menu
image=lite
items=undo,redo,save,preferences,quit
rect=110,2,0,24
xanchor=fixed
yanchor=fixed
[/menu]
[menu]
is_context_menu=true
items=objectives,recruit,recall,preferences,statustable,unitlist,undo,redo,createunit,save,endturn,describeunit,speak
items=describeunit,speak,recruit,recall,createunit,endturn
[/menu]
# top panel

1
data/translations/english.cfg
View file

@ -188,6 +188,7 @@ leader="Leader"
#buttons
main_menu="Menu"
game_menu="Game"
ok_button="Ok"
cancel_button="Cancel"
yes_button="Yes"

12
src/playturn.cpp
View file

@ -161,7 +161,8 @@ void turn_info::turn_slice()
const theme::menu* const m = gui_.menu_pressed(mousex,mousey,mouse_flags&SDL_BUTTON_LMASK);
if(m != NULL) {
show_menu(m->items());
const SDL_Rect& menu_loc = m->location(gui_.screen_area());
show_menu(m->items(),menu_loc.x,menu_loc.y + menu_loc.h);
}
if(key_[SDLK_UP] || mousey < scroll_threshold)
@ -378,7 +379,7 @@ void turn_info::mouse_press(const SDL_MouseButtonEvent& event)
const theme::menu* const m = gui_.get_theme().context_menu();
if(m != NULL) {
std::cerr << "found context menu\n";
show_menu(m->items());
show_menu(m->items(),event.x,event.y);
} else {
std::cerr << "no context menu found...\n";
}
@ -764,7 +765,7 @@ namespace {
};
}
void turn_info::show_menu(const std::vector<std::string>& items_arg)
void turn_info::show_menu(const std::vector<std::string>& items_arg, int xloc, int yloc)
{
std::vector<std::string> items = items_arg;
std::cerr << "Erasing elements" << std::endl;
@ -784,8 +785,9 @@ void turn_info::show_menu(const std::vector<std::string>& items_arg)
menu.push_back(translate_string("action_" + *i));
}
const int res = gui::show_dialog(gui_,NULL,"",string_table["options"]+":\n",
gui::MESSAGE,&menu);
static const std::string style = "menu2";
const int res = gui::show_dialog(gui_,NULL,"","",
gui::MESSAGE,&menu,NULL,"",NULL,NULL,NULL,xloc,yloc,&style);
if(res == -1)
return;

2
src/playturn.hpp
View file

@ -106,7 +106,7 @@ private:
void mouse_press(const SDL_MouseButtonEvent& event);
void left_click(const SDL_MouseButtonEvent& event);
void show_menu(const std::vector<std::string>& items);
void show_menu(const std::vector<std::string>& items, int xloc, int yloc);
void show_attack_options(unit_map::const_iterator u);

10
src/sdl_utils.cpp
View file

@ -158,11 +158,19 @@ void adjust_surface_colour(SDL_Surface* surface, int r, int g, int b)
SDL_Surface* get_surface_portion(SDL_Surface* src, SDL_Rect& area)
{
if(area.x + area.w > src->w || area.y + area.h > src->h) {
if(area.x >= src->w || area.y >= src->h) {
std::cerr << "illegal surface portion...\n";
return NULL;
}
if(area.x + area.w > src->w) {
area.w = src->w - area.x;
}
if(area.y + area.h > src->h) {
area.h = src->h - area.y;
}
const SDL_PixelFormat* const fmt = src->format;
SDL_Surface* const dst = SDL_CreateRGBSurface(0,area.w,area.h,
fmt->BitsPerPixel,fmt->Rmask,

59
src/show_dialog.cpp
View file

@ -40,14 +40,20 @@ bool in_dialog() { return is_in_dialog; }
dialog_manager::dialog_manager() : reset_to(is_in_dialog) {is_in_dialog = true;}
dialog_manager::~dialog_manager() { is_in_dialog = reset_to; }
void draw_dialog_frame(int x, int y, int w, int h, display& disp)
void draw_dialog_frame(int x, int y, int w, int h, display& disp, const std::string* dialog_style)
{
draw_dialog_background(x,y,w,h,disp);
if(dialog_style == NULL) {
static const std::string default_style("menu");
dialog_style = &default_style;
}
const scoped_sdl_surface top(image::get_image("misc/menu-border-top.png",image::UNSCALED));
const scoped_sdl_surface bot(image::get_image("misc/menu-border-bottom.png",image::UNSCALED));
const scoped_sdl_surface left(image::get_image("misc/menu-border-left.png",image::UNSCALED));
const scoped_sdl_surface right(image::get_image("misc/menu-border-right.png",image::UNSCALED));
draw_dialog_background(x,y,w,h,disp,*dialog_style);
const scoped_sdl_surface top(image::get_image("misc/" + *dialog_style + "-border-top.png",image::UNSCALED));
const scoped_sdl_surface bot(image::get_image("misc/" + *dialog_style + "-border-bottom.png",image::UNSCALED));
const scoped_sdl_surface left(image::get_image("misc/" + *dialog_style + "-border-left.png",image::UNSCALED));
const scoped_sdl_surface right(image::get_image("misc/" + *dialog_style + "-border-right.png",image::UNSCALED));
if(top == NULL || bot == NULL || left == NULL || right == NULL)
return;
@ -78,12 +84,11 @@ void draw_dialog_frame(int x, int y, int w, int h, display& disp)
update_rect(x-left->w,y-top->h,w+left->w+right->w,h+top->h+bot->h);
const scoped_sdl_surface top_left(image::get_image("misc/menu-border-topleft.png",image::UNSCALED));
const scoped_sdl_surface bot_left(image::get_image("misc/menu-border-botleft.png",image::UNSCALED));
const scoped_sdl_surface top_right(image::get_image("misc/menu-border-topright.png",image::UNSCALED));
const scoped_sdl_surface bot_right(image::get_image("misc/menu-border-botright.png",image::UNSCALED));
if(top_left == NULL || bot_left == NULL || top_right == NULL ||
bot_right == NULL)
const scoped_sdl_surface top_left(image::get_image("misc/" + *dialog_style + "-border-topleft.png",image::UNSCALED));
const scoped_sdl_surface bot_left(image::get_image("misc/" + *dialog_style + "-border-botleft.png",image::UNSCALED));
const scoped_sdl_surface top_right(image::get_image("misc/" + *dialog_style + "-border-topright.png",image::UNSCALED));
const scoped_sdl_surface bot_right(image::get_image("misc/" + *dialog_style + "-border-botright.png",image::UNSCALED));
if(top_left == NULL || bot_left == NULL || top_right == NULL || bot_right == NULL)
return;
disp.blit_surface(x-top_left->w,y-top_left->h,top_left);
@ -92,11 +97,15 @@ void draw_dialog_frame(int x, int y, int w, int h, display& disp)
disp.blit_surface(x+w,y+h,bot_right);
}
void draw_dialog_background(int x, int y, int w, int h, display& disp)
void draw_dialog_background(int x, int y, int w, int h, display& disp, const std::string& style)
{
static const std::string menu_background = "misc/menu-background.png";
const std::string menu_background = "misc/" + style + "-background.png";
const scoped_sdl_surface bg(image::get_image(menu_background,image::UNSCALED));
if(bg == NULL) {
std::cerr << "could not find dialog background '" << style << "'\n";
return;
}
const SDL_Rect& screen_bounds = disp.screen_area();
if(x < 0)
@ -221,7 +230,8 @@ int show_dialog(display& disp, SDL_Surface* image,
const std::vector<unit>* units_ptr,
const std::string& text_widget_label,
std::string* text_widget_text,
dialog_action* action, std::vector<check_item>* options, int xloc, int yloc)
dialog_action* action, std::vector<check_item>* options, int xloc, int yloc,
const std::string* dialog_style)
{
if(disp.update_locked())
return -1;
@ -385,7 +395,7 @@ int show_dialog(display& disp, SDL_Surface* image,
padding_height + button_heights + menu_.height() +
text_widget_height + check_button_height;
if(xloc == -1 || yloc == -1) {
if(xloc <= -1 || yloc <= -1) {
xloc = scr->w/2 - total_width/2;
yloc = scr->h/2 - total_height/2;
}
@ -403,6 +413,18 @@ int show_dialog(display& disp, SDL_Surface* image,
unity = yloc;
}
const int border_padding = 10;
const int frame_width = total_width + border_padding*2;
const int frame_height = total_height + border_padding*2;
if(xloc + frame_width > scr->w) {
xloc = scr->w - frame_width;
}
if(yloc + frame_height > scr->h) {
yloc = scr->h - frame_height;
}
const int button_wpadding = total_width - button_widths;
int button_offset = 0;
for(size_t button_num = 0; button_num != buttons.size(); ++button_num) {
@ -413,11 +435,12 @@ int show_dialog(display& disp, SDL_Surface* image,
button_offset += buttons[button_num].width();
}
SDL_Rect dlgr = {xloc-10,yloc-10,total_width+20,total_height+20};
SDL_Rect dlgr = {xloc-border_padding,yloc-border_padding,
total_width+border_padding*2,total_height+border_padding*2};
const surface_restorer restorer(&disp.video(),dlgr);
draw_dialog_frame(xloc,yloc,total_width,total_height,disp);
draw_dialog_frame(xloc,yloc,total_width,total_height,disp,dialog_style);
if(menu_.height() > 0)
menu_.set_loc(xloc+total_image_width+left_padding+image_h_padding,

7
src/show_dialog.hpp
View file

@ -38,9 +38,9 @@ private:
bool reset_to;
};
void draw_dialog_frame(int x, int y, int w, int h, display& disp);
void draw_dialog_frame(int x, int y, int w, int h, display& disp, const std::string* dialog_style=NULL);
void draw_dialog_background(int x, int y, int w, int h, display& disp);
void draw_dialog_background(int x, int y, int w, int h, display& disp, const std::string& dialog_style);
void draw_rectangle(int x, int y, int w, int h, short colour, SDL_Surface* tg);
@ -80,7 +80,8 @@ int show_dialog(display& screen, SDL_Surface* image,
const std::string& text_widget_label="",
std::string* text_widget_text=NULL,
dialog_action* action=NULL,
std::vector<check_item>* options=NULL, int xloc=-1, int yloc=-1
std::vector<check_item>* options=NULL, int xloc=-1, int yloc=-1,
const std::string* dialog_style=NULL
);
network::connection network_data_dialog(display& disp, const std::string& msg, config& cfg, network::connection connection_num=0);