diff options
| author | Ira Rice <irarice@gmail.com> | 2009-02-04 11:46:03 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-04 11:46:03 -0700 |
| commit | 555e68e24f2bb7d38f7ce52ce9a43198c0ccedec (patch) | |
| tree | f2ceff93ed6193933165e9fbd408a1df6a8b26e1 /src/gui/speechbubble.cpp | |
| parent | 6110801764f588d0696e75645624be4869b99ee0 (diff) | |
| download | mana-555e68e24f2bb7d38f7ce52ce9a43198c0ccedec.tar.gz mana-555e68e24f2bb7d38f7ce52ce9a43198c0ccedec.tar.bz2 mana-555e68e24f2bb7d38f7ce52ce9a43198c0ccedec.tar.xz mana-555e68e24f2bb7d38f7ce52ce9a43198c0ccedec.zip | |
Went through the gui folder and revised the include statements to not
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/speechbubble.cpp')
| -rw-r--r-- | src/gui/speechbubble.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 7eedce1c..8e3fe3c7 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -25,19 +25,15 @@ #include <guichan/widgets/label.hpp> #include "gui.h" +#include "scrollarea.h" #include "speechbubble.h" - -#include "../resources/image.h" -#include "../resources/resourcemanager.h" +#include "textbox.h" #include "../utils/gettext.h" -// TODO: Fix windows so that they can each load their own skins without the -// other windows overriding another window's skin. SpeechBubble::SpeechBubble(): Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml") { - // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px) setContentSize(140, 46); setShowTitle(false); setTitleBarHeight(0); @@ -62,9 +58,6 @@ SpeechBubble::SpeechBubble(): add(mSpeechArea); setLocationRelativeTo(getParent()); - - // LEEOR / TODO: This causes an exception error. - //moveToBottom(getParent()); } void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color) @@ -83,8 +76,6 @@ void SpeechBubble::setText(std::string mText) if (numRows > 2) { - // 15 == height of each line of text (based on font heights) - // 14 == speechbubble Top + Bottom graphic pixel heights setContentSize(mSpeechBox->getMinWidth() + fontHeight, (numRows * fontHeight) + 6); mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, |