Browse Source

Merge branch 'master' of https://gitgud.io/odilitime/netrunner

# Conflicts:
#	src/TextBlock.cpp
master
despair 5 years ago
parent
commit
c7eb28da2e
  1. 4
      src/TextBlock.cpp

4
src/TextBlock.cpp

@ -140,12 +140,12 @@ size_t TextBlock::setValue(std::string value) { @@ -140,12 +140,12 @@ size_t TextBlock::setValue(std::string value) {
}
std::string TextBlock::getValue() {
std::string value;
std::string value = "";
for(auto s : this->lines) {
value += s + '\r';
}
//std::cout << "TextBlock::getValue before strip[" << !this->trailingNewline << "] [" << value << "] lines[" << this->lines.size() << "]" << std::endl;
if (this->lines.size()) {
if (!this->trailingNewline && this->lines.size()) {
value.pop_back();
}
return value;

Loading…
Cancel
Save