Second Life viewer sources 1.19.0.0

1 files changed, 24 insertions, 15 deletions

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 8ff3c48..1500f9f 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -128,7 +128,11 @@ LLFloater::handle_map_t	LLFloater::sFloaterMap;
 
 LLFloaterView* gFloaterView = NULL;
 
-LLFloater::LLFloater() 
+LLFloater::LLFloater() :
+        //FIXME: we should initialize *all* member variables here
+        mResizable(FALSE),
+        mDragOnLeft(FALSE)
+
 {
         // automatically take focus when opened
         mAutoFocus = TRUE;
@@ -215,9 +219,14 @@ void LLFloater::init(const LLString& title,
         }
         mButtonScale = 1.f;
 
-        LLPanel::deleteAllChildren();
+        BOOL need_border = mBorder != NULL;
+
+        // this will delete mBorder too
+        deleteAllChildren();
+        // make sure we don't have a pointer to an old, deleted border  
+        mBorder = NULL;
         //sjb: HACK! we had a border which was just deleted, so re-create it
-        if (mBorder != NULL)
+        if (need_border)
         {
                 addBorder();
         }
@@ -609,7 +618,7 @@ void LLFloater::releaseFocus()
 
         if( gFocusMgr.childHasKeyboardFocus( this ) )
         {
-                gFocusMgr.setKeyboardFocus(NULL, NULL);
+                gFocusMgr.setKeyboardFocus(NULL);
         }
 
         if( gFocusMgr.childHasMouseCapture( this ) )
@@ -1026,13 +1035,10 @@ void LLFloater::setHost(LLMultiFloater* host)
                 {
                         mButtonsEnabled[BUTTON_TEAR_OFF] = TRUE;
                 }
-
-                mIsFocusRoot = FALSE;
         }
         else if (!mHostHandle.isDead() && !host)
         {
                 mButtonScale = 1.f;
-                mIsFocusRoot = TRUE;
                 //mButtonsEnabled[BUTTON_TEAR_OFF] = FALSE;
         }
         updateButtons();
@@ -1260,6 +1266,7 @@ void LLFloater::show(LLFloater* floaterp)
 {
         if (floaterp) 
         {
+                gFocusMgr.triggerFocusFlash();
                 floaterp->open();
                 if (floaterp->getHost())
                 {
@@ -2245,7 +2252,8 @@ void LLFloaterView::refresh()
                 LLFloater* floaterp = (LLFloater*)*child_it;
                 if( floaterp->getVisible() )
                 {
-                        adjustToFitScreen(floaterp, TRUE);
+                        // minimized floaters are kept fully onscreen
+                        adjustToFitScreen(floaterp, !floaterp->isMinimized());
                 }
         }
 }
@@ -2605,9 +2613,9 @@ void LLMultiFloater::draw()
                 for (S32 i = 0; i < mTabContainer->getTabCount(); i++)
                 {
                         LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(i);
-                        if (floaterp->getTitle() != mTabContainer->getPanelTitle(i))
+                        if (floaterp->getShortTitle() != mTabContainer->getPanelTitle(i))
                         {
-                                mTabContainer->setPanelTitle(i, floaterp->getTitle());
+                                mTabContainer->setPanelTitle(i, floaterp->getShortTitle());
                         }
                 }
                 LLFloater::draw();
@@ -2725,7 +2733,7 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
 
         if ( select_added_floater )
         {
-                mTabContainer->selectLastTab();
+                mTabContainer->selectTabPanel(floaterp);
         }
 
         floaterp->setHost(this);
@@ -2970,8 +2978,9 @@ void LLMultiFloater::updateResizeLimits()
                 // make sure upper left corner doesn't move
                 translate(0, cur_height - mRect.getHeight());
 
-                // Try to keep whole view onscreen, don't allow partial offscreen.
-                gFloaterView->adjustToFitScreen(this, FALSE);
+                // make sure this window is visible on screen when it has been modified
+                // (tab added, etc)
+                gFloaterView->adjustToFitScreen(this, TRUE);
         }
 }