diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.h | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 6 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 18 |
5 files changed, 22 insertions, 11 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 6d65a11cb..df0c9b27d 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -337,7 +337,8 @@ void BrowserBox::addRow(const std::string &row, const bool atTop) void BrowserBox::addRow(const std::string &cmd, const char *const text) { addRow(strprintf("@@%s|%s@@", encodeLinkText(cmd).c_str(), - encodeLinkText(text).c_str())); + encodeLinkText(text).c_str()), + false); } void BrowserBox::addImage(const std::string &path) diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 45502ba5a..66fcae2d9 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -83,7 +83,8 @@ class BrowserBox final : public Widget, /** * Adds a text row to the browser. */ - void addRow(const std::string &row, const bool atTop = false); + void addRow(const std::string &row, + const bool atTop); /** * Adds a menu line to the browser. diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 64cae0ed3..7be67ab91 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -503,7 +503,8 @@ void ChatTab::addRow(std::string &line) } } } - mTextOutput->addRow(line); + mTextOutput->addRow(line, + false); } void ChatTab::loadFromLogFile(const std::string &name) diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 1a1a69227..158bc6dea 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -294,7 +294,8 @@ void NpcDialog::addText(const std::string &text, const bool save) mText.clear(); mNewText.append(text); - mTextBox->addRow(text); + mTextBox->addRow(text, + false); } mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); mActionState = NpcActionState::WAIT; @@ -1312,7 +1313,8 @@ void NpcDialog::createSkinControls() splitToStringVector(parts, info->text, '\n'); FOR_EACH (StringVectCIter, it2, parts) { - box->addRow(*it2); + box->addRow(*it2, + false); } } FOR_EACH (STD_VECTOR<NpcButtonInfo*>::const_iterator, diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index fdecd8ba3..21c3c7f64 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -330,31 +330,36 @@ void QuestsWindow::showQuest(const QuestItem *const quest) { case QuestType::TEXT: default: - mText->addRow(text); + mText->addRow(text, + false); break; case QuestType::NAME: - mText->addRow(std::string("[").append(text).append("]")); + mText->addRow(std::string("[").append(text).append("]"), + false); break; case QuestType::REWARD: mText->addRow(std::string( // TRANSLATORS: quest reward _("Reward:")).append( " ").append( - text)); + text), + false); break; case QuestType::GIVER: mText->addRow(std::string( // TRANSLATORS: quest giver name _("Quest Giver:")).append( " ").append( - text)); + text), + false); break; case QuestType::NPC: mText->addRow(std::string( // TRANSLATORS: quest npc name _("Npc:")).append( " ").append( - text)); + text), + false); break; case QuestType::COORDINATES: mText->addRow(std::string( @@ -363,7 +368,8 @@ void QuestsWindow::showQuest(const QuestItem *const quest) _("Coordinates:"), data.data1.c_str(), data.data2.c_str(), - text.c_str()))); + text.c_str())), + false); break; } } |