1 files changed, 51 insertions, 25 deletions

diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 843a973d..165d216f 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -1,68 +1,94 @@
 /*
- *  The Mana World
+ *  Speech bubbles
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <guichan/font.hpp>
+
+#include <guichan/widgets/label.hpp>
+
+#include "gui.h"
+#include "scrollarea.h"
 #include "speechbubble.h"
+#include "textbox.h"
 
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
+#include "../utils/gettext.h"
 
-SpeechBubble::SpeechBubble()
+SpeechBubble::SpeechBubble():
+    Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml")
 {
-    mSpeechBox = new TextBox();
+    setContentSize(140, 46);
+    setShowTitle(false);
+    setTitleBarHeight(0);
+
+    mCaption = new gcn::Label("");
+    mCaption->setFont(boldFont);
+    mCaption->setPosition(5, 3);
+
+    mSpeechBox = new TextBox;
     mSpeechBox->setEditable(false);
     mSpeechBox->setOpaque(false);
 
     mSpeechArea = new ScrollArea(mSpeechBox);
 
-    // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
-    setContentSize(135, 46);
-    setTitleBarHeight(0);
-    loadSkin("graphics/gui/speechbubble.xml");
-
     mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28));
+    mSpeechArea->setDimension(gcn::Rectangle(4, boldFont->getHeight() + 3,
+                                             130, 28));
     mSpeechArea->setOpaque(false);
 
+    add(mCaption);
     add(mSpeechArea);
 
     setLocationRelativeTo(getParent());
+}
 
-    // LEEOR / TODO: This causes an exception error.
-    //moveToBottom(getParent());
-
-    mSpeechBox->setTextWrapped( "" );
+void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color)
+{
+    mCaption->setCaption(name);
+    mCaption->adjustSize();
+    mCaption->setForegroundColor(color);
 }
 
-void SpeechBubble::setText(const std::string mText)
+void SpeechBubble::setText(std::string mText, bool showName)
 {
-    mSpeechBox->setTextWrapped( mText );
+    int width = mCaption->getWidth();
+    mSpeechBox->setTextWrapped(mText, 130 > width ? 130 : width);
+
+    const int fontHeight = getFont()->getHeight();
+    const int numRows = showName ? mSpeechBox->getNumberOfRows() + 1 :
+                                   mSpeechBox->getNumberOfRows();
+    int yPos = showName ? fontHeight + 3 : 3;
+    int height = (numRows * fontHeight);
+
+    if (width < mSpeechBox->getMinWidth())
+        width = mSpeechBox->getMinWidth();
 
-    int numRows = mSpeechBox->getNumberOfRows();
+    if (numRows == 1)
+    {
+        yPos = (fontHeight / 4) + 3;
+        height = ((3 * fontHeight) / 2) + 1;
+    }
 
-    // 31 == speechbubble Top + Bottom graphic pixel heights
-    // 15 == height of each line of text (based on font heights)
-    setContentSize(135, 31 + (numRows * 15) );
-    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, (31 + (numRows * 14)) - 18 ));
+    setContentSize(width + fontHeight, height + 6);
+    mSpeechArea->setDimension(gcn::Rectangle(4, yPos, width + 5, height));
 }
 
 unsigned int SpeechBubble::getNumRows()