summaryrefslogtreecommitdiff
path: root/src/gui/minimap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/minimap.cpp')
-rw-r--r--src/gui/minimap.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index d939ea27..3dab63a3 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -56,20 +56,21 @@ Minimap::Minimap():
setResizable(false);
setDefaultVisible(true);
- setSaveVisible(true);
+ setSaveVisible(false);
setStickyButton(true);
setSticky(false);
loadWindowState();
+ setVisible(mShow);
}
Minimap::~Minimap()
{
+ config.setValue(getWindowName() + "Show", mShow);
+
if (mMapImage)
mMapImage->decRef();
-
- config.setValue(getWindowName() + "Show", mShow);
}
void Minimap::setMap(Map *map)
@@ -93,6 +94,9 @@ void Minimap::setMap(Map *map)
ResourceManager *resman = ResourceManager::getInstance();
mMapImage = resman->getImage(map->getProperty("minimap"));
+ if (!mShow)
+ return;
+
if (mMapImage)
{
const int offsetX = 2 * getPadding();
@@ -116,7 +120,7 @@ void Minimap::setMap(Map *map)
setDefaultSize(getX(), getY(), getWidth(), getHeight());
resetToDefaultSize();
- setVisible(mShow);
+ setVisible(true);
}
else
{
@@ -126,7 +130,8 @@ void Minimap::setMap(Map *map)
void Minimap::toggle()
{
- setVisible(!isVisible(), true);
+ setVisible(!mShow, isSticky());
+ mShow = isVisible();
}
void Minimap::draw(gcn::Graphics *graphics)