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

EXP-1364 FIX Debug console output covered by left toolbar buttons if present 

EXP-1427 FIX Voice Settings dialog closes when selecting minimize option
master
Richard Nelson 2011-10-19 18:45:22 -07:00
parent 6d7ab5d134
commit eedc8687b0
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/lldockablefloater.cpp
View File

@ -162,10 +162,15 @@ void LLDockableFloater::setVisible(BOOL visible)
void LLDockableFloater::setMinimized(BOOL minimize)
{
if(minimize)
if(minimize && isDocked())
{
// minimizing a docked floater just hides it
setVisible(FALSE);
}
else
{
LLFloater::setMinimized(minimize);
}
}
LLView * LLDockableFloater::getDockWidget()

7
indra/llui/llfloater.cpp
View File

@ -1479,6 +1479,7 @@ BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask)
if(offerClickToButton(x, y, mask, BUTTON_CLOSE)) return TRUE;
if(offerClickToButton(x, y, mask, BUTTON_RESTORE)) return TRUE;
if(offerClickToButton(x, y, mask, BUTTON_TEAR_OFF)) return TRUE;
if(offerClickToButton(x, y, mask, BUTTON_DOCK)) return TRUE;
// Otherwise pass to drag handle for movement
return mDragHandle->handleMouseDown(x, y, mask);
@ -1584,6 +1585,12 @@ void LLFloater::setDocked(bool docked, bool pop_on_undock)
{
mDocked = docked;
mButtonsEnabled[BUTTON_DOCK] = !mDocked;
if (mDocked)
{
setMinimized(FALSE);
}
updateTitleButtons();
storeDockStateControl();

9
indra/newview/lldebugview.cpp
View File

@ -147,3 +147,12 @@ LLDebugView::~LLDebugView()
gTextureCategoryView = NULL;
}
void LLDebugView::draw()
{
LLView* floater_snap_region = getRootView()->getChildView("floater_snap_region");
LLRect debug_rect;
floater_snap_region->localRectToOtherView(floater_snap_region->getLocalRect(), &debug_rect, getParent());
setShape(debug_rect);
LLView::draw();
}

1
indra/newview/lldebugview.h
View File

@ -55,6 +55,7 @@ public:
~LLDebugView();
void init();
void draw();
void setStatsVisible(BOOL visible);