summaryrefslogtreecommitdiff
path: root/src/gui/speechbubble.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-03-24 22:55:57 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-03-31 17:57:30 +0200
commit9a0f5327c25c57963af837439d23a61c9510a6ac (patch)
treeb185f39126080409d981fd83e657a7e963804b0f /src/gui/speechbubble.cpp
parent2053bb3a588b504f255e83b1e7b4f9b935a5cbf3 (diff)
downloadMana-9a0f5327c25c57963af837439d23a61c9510a6ac.tar.gz
Mana-9a0f5327c25c57963af837439d23a61c9510a6ac.tar.bz2
Mana-9a0f5327c25c57963af837439d23a61c9510a6ac.tar.xz
Mana-9a0f5327c25c57963af837439d23a61c9510a6ac.zip
Removed the ability to assign custom skins to windows/popups
Old settings are causing it to fall back on the wrong combination of files if old data is in the search path. Reviewed-by: Jared Adams
Diffstat (limited to 'src/gui/speechbubble.cpp')
-rw-r--r--src/gui/speechbubble.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 8d7458aa..08d00038 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -50,8 +50,6 @@ SpeechBubble::SpeechBubble():
add(mCaption);
add(mSpeechBox);
-
- loadPopupConfiguration();
}
void SpeechBubble::setCaption(const std::string &name, const gcn::Color *color)
@@ -73,7 +71,7 @@ void SpeechBubble::setText(const std::string &text, bool showName)
const int speechWidth = mSpeechBox->getMinWidth() + 2 * getPadding();
const int fontHeight = getFont()->getHeight();
- const int nameHeight = showName ? mCaption->getHeight() +
+ const int nameHeight = showName ? mCaption->getHeight() +
(getPadding() / 2) : 0;
const int numRows = mSpeechBox->getNumberOfRows();
const int height = (numRows * fontHeight) + nameHeight + getPadding();