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

improve the alignment of the campaign dialog some more

Browse source
This commit is contained in:
Patrick Parker 2007-10-06 05:36:49 +00:00
parent e18a5ef618
commit 6ac002bcf2
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dialogs.cpp
View file

@ -842,9 +842,9 @@ void campaign_preview_pane::draw_contents()
const SDL_Rect area = {
location().x+campaign_preview_border,
location().y+campaign_preview_border*5,
location().y,
location().w-campaign_preview_border*2,
location().h-campaign_preview_border*6 };
location().h };
/* background frame */
gui::dialog_frame f(video(), "", gui::dialog_frame::preview_style, false);

27
src/game.cpp
View file

@ -35,6 +35,7 @@
#include "language.hpp"
#include "loadscreen.hpp"
#include "widgets/menu.hpp"
#include "marked-up_text.hpp"
#include "multiplayer.hpp"
#include "network.hpp"
#include "playcampaign.hpp"
@ -811,31 +812,35 @@ bool game_controller::new_campaign()
campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
}
int res = 0;
dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
if(campaign_names.size() <= 0) {
return false;
}
gui::dialog cmenu(disp(),_("Campaign"),
_("Choose the campaign you want to play:"),
gui::OK_CANCEL);
gui::dialog cmenu(disp(), _("Play a campaign"), " ", gui::OK_CANCEL);
cmenu.set_menu(campaign_names);
cmenu.add_pane(&campaign_preview);
cmenu.layout();
gui::dialog::dimension_measurements dim = cmenu.layout();
Uint16 screen_width = screen_area().w;
Uint16 dialog_width = cmenu.get_frame().get_layout().exterior.w;
if(screen_width < 850 && screen_width - dialog_width > 20) {
// On small resolutions, reduce the amount of unused horizontal space
campaign_preview.set_width(campaign_preview.width() + screen_width - dialog_width - 20);
campaign_preview.set_width(campaign_preview.width() + screen_width - dialog_width - 20);
dim = cmenu.layout();
}
res = cmenu.show();
if(res == -1) {
SDL_Rect& preview_loc = dim.panes[&campaign_preview];
preview_loc.y = dim.menu_y;
if(dim.menu_height > 0) {
preview_loc.h = dim.menu_height;
} else {
preview_loc.h = cmenu.get_menu().height();
}
cmenu.set_layout(dim);
if(cmenu.show() == -1) {
return false;
}
const config& campaign = *campaigns[res];
const config& campaign = *campaigns[cmenu.result()];
state_.campaign = campaign["id"];
state_.scenario = campaign["first_scenario"];