Merge branch 'master' of git@gitorious.org:tmw/mainline

1 files changed, 4 insertions, 9 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 6bca796d..bfd34390 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -45,6 +45,9 @@ Minimap::Minimap():
     setDefaultSize(5, 25, 100, 100);
     setResizable(true);
 
+    setStickyButton(true);
+    setSticky(false);
+
     loadWindowState();
 }
 
@@ -92,21 +95,13 @@ void Minimap::setMapImage(Image *img)
 
 void Minimap::toggle()
 {
-    mShow = !mShow;
+    setVisible(!isVisible(), true);
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
 {
-    setVisible(mShow);
-
-    if (!isVisible())
-        return;
-
     Window::draw(graphics);
 
-    if (!mShow)
-        return;
-
     const gcn::Rectangle a = getChildrenArea();
 
     graphics->pushClipArea(a);