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

removed visiblewhenminimized logic pending redesign

meow-7.2.2
Richard Nelson 2011-10-12 19:17:44 -07:00
parent 86cbb16e27
commit 8affdabac3
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llui/llfloater.cpp
View File

@ -252,7 +252,6 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
mHeaderHeight(p.header_height),
mLegacyHeaderHeight(p.legacy_header_height),
mMinimized(FALSE),
mVisibleWhenMinimized(TRUE),
mForeground(FALSE),
mFirstLook(TRUE),
mButtonScale(1.0f),
@ -1433,17 +1432,6 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
floaterp->mDependeeHandle = LLHandle<LLFloater>();
}
void LLFloater::setVisibleWhenMinimized(bool visible)
{
mVisibleWhenMinimized = visible;
if (visible && isMinimized())
{
// restack in minimized stack
setMinimized(FALSE);
setMinimized(TRUE);
}
}
BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index)
{
if( mButtonsEnabled[index] )
@ -1820,14 +1808,11 @@ void LLFloater::draw()
}
if (isMinimized())
{
if (mVisibleWhenMinimized)
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
drawChild(mButtons[i]);
}
drawChild(mDragHandle);
drawChild(mButtons[i]);
}
drawChild(mDragHandle);
}
else
{
@ -2482,7 +2467,7 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
{
// Examine minimized children.
LLFloater* floater = (LLFloater*)((LLView*)*child_it);
if(floater->isMinimized() && floater->getVisibleWhenMinimized())
if(floater->isMinimized())
{
LLRect r = floater->getRect();
if((r.mBottom < (row + floater_header_size))

3
indra/llui/llfloater.h
View File

@ -217,8 +217,6 @@ public:
LLFloater* getDependee() { return (LLFloater*)mDependeeHandle.get(); }
void removeDependentFloater(LLFloater* dependent);
BOOL isMinimized() const { return mMinimized; }
void setVisibleWhenMinimized(bool visible);
bool getVisibleWhenMinimized() const { return mVisibleWhenMinimized;}
/// isShown() differs from getVisible() in that isShown() also considers
/// isMinimized(). isShown() is true only if visible and not minimized.
bool isShown() const;
@ -429,7 +427,6 @@ private:
S32 mLegacyHeaderHeight;// HACK see initFloaterXML()
BOOL mMinimized;
bool mVisibleWhenMinimized;
BOOL mForeground;
LLHandle<LLFloater> mDependeeHandle;