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
master
Yuri Chebotarev 2010-06-02 18:23:06 +03:00
parent 0473ab08d8
commit 129d504dd9
3 changed files with 13 additions and 4 deletions

View File

@ -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();
}

View File

@ -61,6 +61,8 @@ private:
void handleStopTracking (const LLSD& userdata);
void setDirectionPos( LLTextBox* text_box, F32 rotation );
void updateMinorDirections();
void stretchMiniMap(S32 width,S32 height);
LLMenuGL* mPopupMenu;

View File

@ -5,7 +5,7 @@
can_minimize="true"
can_resize="true"
follows="top|right"
height="218"
height="174"
layout="topleft"
min_height="174"
min_width="174"