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

Some build fixups to reflect changes since the help commits were originally made

Browse source
This commit is contained in:
Charles Dang 2018-03-19 10:35:30 +11:00
parent 5193c7e7bf
commit 1167e3e78b
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/gui/widget/toggle_button_help_topic.cfg
View file

@ -19,9 +19,6 @@
description = "This toggle button is meant to be used in topic tree in the help browser"
[resolution]
{GUI_NORMAL__RESOLUTION}
min_width = 26
min_height = 26

2
src/gui/dialogs/help_browser.cpp
View file

@ -128,7 +128,7 @@ static std::string format_help_text(const config& cfg)
throw help::parse_error(msg.str());
};
// TODO: Get the proper link shade from somewhere
ss << font::format_as_link(font::escape_text(item.cfg["text"]), "#ffff00");
ss << font::format_as_link(font::escape_text(item.cfg["text"]), color_t::from_hex_string("ffff00"));
} else if(item.key == "img") {
if(item.cfg["src"].empty()) {
throw help::parse_error("Img markup must have src attribute.");

5
src/help/help_impl.cpp
View file

@ -45,7 +45,6 @@
#include "units/types.hpp" // for unit_type, unit_type_data, etc
#include "serialization/unicode.hpp" // for iterator
#include "color.hpp"
#include "config_assign.hpp"
#include <cassert> // for assert
#include <algorithm> // for sort, find, transform, etc
@ -1187,7 +1186,7 @@ config parse_text(const std::string &text)
ss << c;
}
else {
res.add_child("text", config_of("text", ss.str()));
res.add_child("text", config{ "text", ss.str() });
ss.str("");
state = ELEMENT_NAME;
}
@ -1243,7 +1242,7 @@ config parse_text(const std::string &text)
}
if (!ss.str().empty()) {
// Add the last string.
res.add_child("text", config_of("text", ss.str()));
res.add_child("text", config{ "text", ss.str() });
}
return res;
}