diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-16 20:24:01 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-16 20:24:01 +0300 |
commit | 79114bbfe4bddf95345c33505a750f3aa80f1c56 (patch) | |
tree | 39751d014470c8c918d6bdb0d3893a1e7a841fa8 /src/gui/popups | |
parent | 7f7ac0e998506fb2b19b03ae4f2ef6ef04b87b13 (diff) | |
download | manaverse-79114bbfe4bddf95345c33505a750f3aa80f1c56.tar.gz manaverse-79114bbfe4bddf95345c33505a750f3aa80f1c56.tar.bz2 manaverse-79114bbfe4bddf95345c33505a750f3aa80f1c56.tar.xz manaverse-79114bbfe4bddf95345c33505a750f3aa80f1c56.zip |
fix compilation warnings.
Diffstat (limited to 'src/gui/popups')
-rw-r--r-- | src/gui/popups/speechbubble.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index 7febfdf4c..0c40676f6 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -74,22 +74,18 @@ void SpeechBubble::setText(const std::string &text, const bool showName) mSpeechBox->setForegroundColorAll(getThemeColor(Theme::BUBBLE_TEXT), getThemeColor(Theme::BUBBLE_TEXT_OUTLINE)); - const int pad = mPadding; int width = mCaption->getWidth(); mSpeechBox->clearRows(); mSpeechBox->addRow(text); mSpeechBox->setWidth(mSpeechBox->getDataWidth()); - const int speechWidth = mSpeechBox->getWidth(); - const int fontHeight = getFont()->getHeight(); + const int speechWidth = mSpeechBox->getWidth(); const int nameHeight = showName ? mCaption->getHeight() + mSpacing : 0; - int height = fontHeight + nameHeight; if (width < speechWidth) width = speechWidth; - setContentSize(width, height); - + setContentSize(width, getFont()->getHeight() + nameHeight); mCaption->setPosition(0, 0); mSpeechBox->setPosition(0, nameHeight); } |