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

fix border handling in gui2 to allow selective border types like "top,left"

Browse source
This commit is contained in:
Tomasz Śniatowski 2009-07-12 18:11:53 +01:00
parent b78451a9ee
commit 1c6082ccd1
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/gui/auxiliary/window_builder/helper.cpp
View file

@ -17,6 +17,7 @@
#include "gui/auxiliary/window_builder/helper.hpp"
#include "config.hpp"
#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/grid.hpp"
#include "gui/widgets/window.hpp"
@ -57,35 +58,21 @@ unsigned get_h_align(const std::string& h_align)
unsigned get_border(const std::vector<std::string>& border)
{
if(std::find(border.begin(), border.end(), std::string("all"))
!= border.end()) {
return tgrid::BORDER_TOP
| tgrid::BORDER_BOTTOM | tgrid::BORDER_LEFT | tgrid::BORDER_RIGHT;
} else {
if(std::find(border.begin(), border.end(), std::string("top"))
!= border.end()) {
return tgrid::BORDER_TOP;
}
if(std::find(border.begin(), border.end(), std::string("bottom"))
!= border.end()) {
return tgrid::BORDER_BOTTOM;
}
if(std::find(border.begin(), border.end(), std::string("left"))
!= border.end()) {
return tgrid::BORDER_LEFT;
}
if(std::find(border.begin(), border.end(), std::string("right"))
!= border.end()) {
return tgrid::BORDER_RIGHT;
unsigned result = 0;
foreach (const std::string& s, border) {
if (s == "all") {
return tgrid::BORDER_ALL;
} else if (s == "top") {
result |= tgrid::BORDER_TOP;
} else if (s == "bottom") {
result |= tgrid::BORDER_BOTTOM;
} else if (s == "left") {
result |= tgrid::BORDER_LEFT;
} else if (s == "right") {
result |= tgrid::BORDER_RIGHT;
}
}
return 0;
return result;
}
unsigned read_flags(const config& cfg)