Fixed location combobox not updating properly when a slurl link is clicked. Reset the location combobox when a different grid is selected (added setCurrentGridChangeCallback to hippogridmanager). Moved login panel elements into a layout_stack so hiding the grid or location columns no longer leaves big empty gaps.

This commit is contained in:
Shyotl
2013-07-05 02:28:36 -05:00
parent 624141a31a
commit bbb0bd54bf
12 changed files with 357 additions and 231 deletions

View File

@@ -646,6 +646,8 @@ HippoGridManager::HippoGridManager() :
HippoGridManager::~HippoGridManager()
{
cleanup();
if(mCurrentGridChangeSignal)
delete mCurrentGridChangeSignal;
}
@@ -805,6 +807,7 @@ void HippoGridManager::setDefaultGrid(const std::string& grid)
void HippoGridManager::setCurrentGrid(const std::string& grid)
{
HippoGridInfo* prevGrid = getGrid(mCurrentGrid);
GridIterator it = mGridInfo.find(grid);
if (it != mGridInfo.end())
{
@@ -815,6 +818,8 @@ void HippoGridManager::setCurrentGrid(const std::string& grid)
llwarns << "Unknown grid '" << grid << "'. Setting to default grid." << llendl;
mCurrentGrid = mDefaultGrid;
}
if(mCurrentGridChangeSignal)
(*mCurrentGridChangeSignal)(getGrid(mCurrentGrid),prevGrid);
}