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

Fix old bug with attackers's info of attack dialog when long words were used.

Browse source 
(ex: very long unit type name break all following infos)

Also now show head instead of tail for these long words when not
enough space.
This commit is contained in:
Ali El Gariani 2009-10-22 00:41:59 +00:00
parent 47f2cbc72c
commit 1b29677fbb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dialogs.cpp
View file

@ -817,21 +817,24 @@ void unit_preview_pane::draw_contents()
const std::vector<std::string> lines = utils::split(text.str(), '\n',
utils::STRIP_SPACES & !utils::REMOVE_EMPTY);
SDL_Rect cur_area = area;
int ypos = area.y;
if(weapons_) {
cur_area.y += image_rect.h + description_rect.h + details_button_.location().h;
ypos += image_rect.h + description_rect.h + details_button_.location().h;
}
for(std::vector<std::string>::const_iterator line = lines.begin(); line != lines.end(); ++line) {
int xpos = cur_area.x;
int xpos = area.x;
if(right_align && !weapons_) {
const SDL_Rect& line_area = font::text_area(*line,font::SIZE_SMALL);
xpos = cur_area.x + cur_area.w - line_area.w;
// right align, but if too long, don't hide line's beginning
if (line_area.w < area.w)
xpos = area.x + area.w - line_area.w;
}
cur_area = font::draw_text(&video(),location(),font::SIZE_SMALL,font::NORMAL_COLOUR,*line,xpos,cur_area.y);
cur_area.y += cur_area.h;
SDL_Rect cur_area = font::draw_text(&video(),location(),font::SIZE_SMALL,font::NORMAL_COLOUR,*line,xpos,ypos);
ypos += cur_area.h;
}
}