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

Merge pull request #937 from fujimo-t/fix_25332

Browse source 
Fix bug #25332, some sentences are not shown in help pages
This commit is contained in:
Jyrki Vesterinen 2017-02-28 22:21:37 +02:00 • committed by GitHub
commit c74fcca29b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/font/sdl_ttf.cpp
View file

@ -303,10 +303,8 @@ static surface render_text(const std::string& text, int fontsize, const color_t&
return surface();
} else if (surfaces.size() == 1 && surfaces.front().size() == 1) {
surface surf = surfaces.front().front();
adjust_surface_alpha(surf, SDL_ALPHA_OPAQUE);
return surf;
} else {
surface res(create_compatible_surface(surfaces.front().front(),width,height));
if (res.null())
return res;
@ -319,9 +317,8 @@ static surface render_text(const std::string& text, int fontsize, const color_t&
for(std::vector<surface>::iterator j = i->begin(),
j_end = i->end(); j != j_end; ++j) {
adjust_surface_alpha(*j, SDL_ALPHA_TRANSPARENT); // direct blit without alpha blending
SDL_Rect dstrect = sdl::create_rect(xpos, ypos, 0, 0);
sdl_blit(*j, nullptr, res, &dstrect);
blit_surface(*j, nullptr, res, &dstrect);
xpos += (*j)->w;
height = std::max<size_t>((*j)->h, height);
}