summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermap.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-02 18:23:06 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-02 18:23:06 +0300
commit129d504dd90c9819d6cc60f70f3bcbb1489f3ade (patch)
tree7fcb664732d42c64425e5193f68f8de065968014 /indra/newview/llfloatermap.cpp
parent0473ab08d81a7f5b87dfe02cbb95bd9863df1757 (diff)
EXT-7550 FIX fix floater height and minimap position right after start.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/497/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
-rw-r--r--indra/newview/llfloatermap.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 725fc17136..c259659083 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -106,6 +106,8 @@ BOOL LLFloaterMap::postBuild()
mPopupMenu->setItemEnabled ("Stop Tracking", false);
}
+ stretchMiniMap(getRect().getWidth(),getRect().getHeight());
+
updateMinorDirections();
// Get the drag handle all the way in back
@@ -229,10 +231,8 @@ void LLFloaterMap::onFocusLost()
LLPanel::onFocusLost();
}
-void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLFloaterMap::stretchMiniMap(S32 width,S32 height)
{
- LLFloater::reshape(width, height, called_from_parent);
-
//fix for ext-7112
//by default ctrl can't overlap caption area
if(mMap)
@@ -242,6 +242,13 @@ void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
mMap->reshape( width, height, 1);
mMap->setRect(map_rect);
}
+}
+
+void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ LLFloater::reshape(width, height, called_from_parent);
+
+ stretchMiniMap(width, height);
updateMinorDirections();
}