Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 99a95a2e..0e839b1f 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -83,7 +83,11 @@ TextField::~TextField()
 
 void TextField::draw(gcn::Graphics *graphics)
 {
-    if (isFocused()) {
+    if (!isVisible())
+        return;
+
+    if (isFocused())
+    {
         drawCaret(graphics,
                 getFont()->getWidth(mText.substr(0, mCaretPosition)) -
                 mXScroll);