summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/npc_text.cpp')
-rw-r--r--src/gui/npc_text.cpp29
1 files changed, 6 insertions, 23 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index b6bd962f..7fc59343 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -37,6 +37,8 @@ NpcTextDialog::NpcTextDialog():
okButton = new Button("OK");
setContentSize(260, 175);
+ scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+ scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
scrollArea->setDimension(gcn::Rectangle(
5, 5, 250, 160 - okButton->getHeight()));
okButton->setPosition(
@@ -61,32 +63,13 @@ NpcTextDialog::~NpcTextDialog()
void NpcTextDialog::setText(const char *text)
{
- std::string tmp = "";
- int lineWidth = 0;
- int w = scrollArea->getWidth();
- for (unsigned int i = 0; i < strlen(text); i++)
- {
- if (text[i] != '\n')
- {
- std::string tmpChar = ""; tmpChar += text[i];
- lineWidth += getFont()->getWidth(tmpChar);
- if (lineWidth > w) {
- tmp += '\n';
- lineWidth = 0;
- }
- } else
- {
- lineWidth = 0;
- }
- tmp += text[i];
- }
- textBox->setText(tmp);
+ textBox->setText(text);
}
void NpcTextDialog::addText(const char *text)
{
- std::string tmp = textBox->getText() + std::string(text) + std::string("\n");
- setText(tmp.c_str());
+ textBox->setText(
+ textBox->getText() + std::string(text) + std::string("\n"));
}
void NpcTextDialog::action(const std::string& eventId)
@@ -96,5 +79,5 @@ void NpcTextDialog::action(const std::string& eventId)
WFIFOSET(6);
setText("");
setVisible(false);
- current_npc = 0;
+ current_npc = 0;
}