livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed normal bug EXT-2724 (Mini map mimimizes underneath Nav bar when Favorites bar has been hidden) and 

partially fixed EXT-2742 (Invalid menu appearance after hiding navigation bar and/or favorites bar). Problem
in fixed part of EXT-2742 was the same as the one which caused EXT-2724.

--HG--
branch : product-engine
meow-7.2.2
Andrew Dyukov 2009-12-11 22:03:17 +02:00
parent fd99f8701c
commit b6b861eaaf
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewercontrol.cpp
View File

@ -515,30 +515,13 @@ bool toggle_show_snapshot_button(const LLSD& newvalue)
bool toggle_show_navigation_panel(const LLSD& newvalue)
{
LLRect floater_view_rect = gFloaterView->getRect();
LLNavigationBar* navbar = LLNavigationBar::getInstance();
//if newvalue contains 0 => navbar should turn invisible, so floater_view_rect should get higher,
//and to do this pm=1, else if navbar becomes visible pm=-1 so floater_view_rect gets lower.
int pm=newvalue.asBoolean()?-1:1;
floater_view_rect.mTop += pm*(navbar->getDefNavBarHeight()-navbar->getDefFavBarHeight());
gFloaterView->setRect(floater_view_rect);
floater_view_rect = gFloaterView->getRect();
navbar->showNavigationPanel(newvalue.asBoolean());
LLNavigationBar::getInstance()->showNavigationPanel(newvalue.asBoolean());
return true;
}
bool toggle_show_favorites_panel(const LLSD& newvalue)
{
LLRect floater_view_rect = gFloaterView->getRect();
LLNavigationBar* navbar = LLNavigationBar::getInstance();
//if newvalue contains 0 => favbar should turn invisible, so floater_view_rect should get higher,
//and to do this pm=1, else if favbar becomes visible pm=-1 so floater_view_rect gets lower.
int pm=newvalue.asBoolean()?-1:1;
floater_view_rect.mTop += pm*navbar->getDefFavBarHeight();
gFloaterView->setRect(floater_view_rect);
navbar->showFavoritesPanel(newvalue.asBoolean());
LLNavigationBar::getInstance()->showFavoritesPanel(newvalue.asBoolean());
return true;
}

4
indra/newview/llviewerwindow.cpp
View File

@ -1526,12 +1526,12 @@ void LLViewerWindow::initWorldUI()
if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
{
toggle_show_navigation_panel(LLSD(0));
navbar->showNavigationPanel(FALSE);
}
if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"))
{
toggle_show_favorites_panel(LLSD(0));
navbar->showFavoritesPanel(FALSE);
}
if (!gSavedSettings.getBOOL("ShowCameraButton"))