FIRE-15101: Fix bottom toolbar buttons show in mouselook; Firestorm_4.6.9

Thu, 11 Dec 2014 11:05:24 +0100

author
Ansariel
date
Thu, 11 Dec 2014 11:05:24 +0100
branch
Firestorm_4.6.9
changeset 43063
32a493c57d99
parent 43062
cec586b490f6
child 43064
7dff8a88498f

FIRE-15101: Fix bottom toolbar buttons show in mouselook;

This fix reverts the initial fix for FIRE-5141 (e756e5e01e11) and replaces it
with a more specific one: The panel for the bottom toolbar buttons will always
stay visible regardless if it contains buttons or not, unless the whole toolbar
itself will be hidden (which happens for mouselook in case the UI should not be
shown). This means the nearby chat bar can be resized unless being in mouselook
and having UI in mouselook disabled.

indra/llui/lllayoutstack.cpp file | annotate | diff | revisions
indra/llui/lllayoutstack.h file | annotate | diff | revisions
indra/newview/lltoolbarview.cpp file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_toolbar_view.xml file | annotate | diff | revisions
indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml file | annotate | diff | revisions
indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml file | annotate | diff | revisions
     1.1 --- a/indra/llui/lllayoutstack.cpp	Mon Dec 08 09:33:24 2014 +0100
     1.2 +++ b/indra/llui/lllayoutstack.cpp	Thu Dec 11 11:05:24 2014 +0100
     1.3 @@ -49,8 +49,7 @@
     1.4  :	expanded_min_dim("expanded_min_dim", 0),
     1.5  	min_dim("min_dim", -1),
     1.6  	user_resize("user_resize", false),
     1.7 -	auto_resize("auto_resize", true),
     1.8 -	force_resize_bar("force_resize_bar", false) // <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
     1.9 +	auto_resize("auto_resize", true)
    1.10  {
    1.11  	addSynonym(min_dim, "min_width");
    1.12  	addSynonym(min_dim, "min_height");
    1.13 @@ -69,8 +68,7 @@
    1.14  	mFractionalSize(0.f),
    1.15  	mTargetDim(0),
    1.16  	mIgnoreReshape(false),
    1.17 -	mOrientation(LLLayoutStack::HORIZONTAL),
    1.18 -	mForceResizeBar(p.force_resize_bar) // <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.19 +	mOrientation(LLLayoutStack::HORIZONTAL)
    1.20  {
    1.21  	// panels initialized as hidden should not start out partially visible
    1.22  	if (!getVisible())
    1.23 @@ -476,10 +474,7 @@
    1.24  
    1.25  		if (panelp->mAutoResize 
    1.26  			&& !panelp->mCollapsed 
    1.27 -			// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.28 -			//&& panelp->getVisible())
    1.29 -			&& (panelp->getVisible() || panelp->mForceResizeBar))
    1.30 -			// </FS:Ansariel>
    1.31 +			&& panelp->getVisible())
    1.32  		{
    1.33  			S32 space_for_panel = remaining_space > 0 ? 1 : -1;
    1.34  			panelp->mTargetDim += space_for_panel;
    1.35 @@ -792,10 +787,7 @@
    1.36  	//
    1.37  	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
    1.38  	{
    1.39 -		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.40 -		//if (panelp->getVisible())
    1.41 -		if (panelp->getVisible() || panelp->mForceResizeBar)
    1.42 -		// </FS:Ansariel>
    1.43 +		if (panelp->getVisible())
    1.44  		{
    1.45  			if (mAnimate && panelp->mVisibleAmt < 1.f)
    1.46  			{
    1.47 @@ -896,10 +888,7 @@
    1.48  		if (panelp->mAutoResize)
    1.49  		{
    1.50  			old_auto_resize_headroom += (F32)(panelp->mTargetDim - panelp->getRelevantMinDim());
    1.51 -			// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.52 -			//if (panelp->getVisible() && !panelp->mCollapsed)
    1.53 -			if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
    1.54 -			// </FS:Ansariel>
    1.55 +			if (panelp->getVisible() && !panelp->mCollapsed)
    1.56  			{
    1.57  				total_visible_fraction += panelp->mFractionalSize;
    1.58  			}
    1.59 @@ -910,10 +899,7 @@
    1.60  			other_resize_panel = following_panel;
    1.61  		}
    1.62  
    1.63 -		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.64 -		//if (panelp->getVisible() && !panelp->mCollapsed)
    1.65 -		if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
    1.66 -		// </FS:Ansariel>
    1.67 +		if (panelp->getVisible() && !panelp->mCollapsed)
    1.68  		{
    1.69  			following_panel = panelp;
    1.70  		}
    1.71 @@ -948,10 +934,7 @@
    1.72  
    1.73  	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
    1.74  	{
    1.75 -		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.76 -		//if (!panelp->getVisible() || panelp->mCollapsed) 
    1.77 -		if ((!panelp->getVisible() && !panelp->mForceResizeBar) || panelp->mCollapsed) 
    1.78 -		// </FS:Ansariel>
    1.79 +		if (!panelp->getVisible() || panelp->mCollapsed) 
    1.80  		{
    1.81  			if (panelp->mAutoResize) 
    1.82  			{
    1.83 @@ -1059,10 +1042,7 @@
    1.84  	LLLayoutPanel* previous_visible_panelp = NULL;
    1.85  	BOOST_REVERSE_FOREACH(LLLayoutPanel* visible_panelp, mPanels)
    1.86  	{
    1.87 -		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    1.88 -		//if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
    1.89 -		if ((!visible_panelp->getVisible() && !visible_panelp->mForceResizeBar) || visible_panelp->mCollapsed)
    1.90 -		// </FS:Ansariel>
    1.91 +		if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
    1.92  		{
    1.93  			visible_panelp->mResizeBar->setVisible(FALSE);
    1.94  			continue;
     2.1 --- a/indra/llui/lllayoutstack.h	Mon Dec 08 09:33:24 2014 +0100
     2.2 +++ b/indra/llui/lllayoutstack.h	Thu Dec 11 11:05:24 2014 +0100
     2.3 @@ -151,9 +151,6 @@
     2.4  		Optional<bool>			user_resize,
     2.5  								auto_resize;
     2.6  
     2.7 -		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
     2.8 -		Optional<bool>			force_resize_bar;
     2.9 -
    2.10  		Params();
    2.11  	};
    2.12  
    2.13 @@ -223,9 +220,6 @@
    2.14  	LLView::EOrientation mOrientation;
    2.15  	class LLResizeBar* mResizeBar;
    2.16  
    2.17 -	// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
    2.18 -	bool	mForceResizeBar;
    2.19 -
    2.20  	// <FS:Ansariel> Add callback for reshaping
    2.21  	reshape_panel_callback_t mReshapePanelCallback;
    2.22  };
     3.1 --- a/indra/newview/lltoolbarview.cpp	Mon Dec 08 09:33:24 2014 +0100
     3.2 +++ b/indra/newview/lltoolbarview.cpp	Thu Dec 11 11:05:24 2014 +0100
     3.3 @@ -603,7 +603,10 @@
     3.4  	for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; i++)
     3.5  	{
     3.6  		mToolbars[i]->getParent()->setVisible(mShowToolbars 
     3.7 -											&& (mToolbars[i]->hasButtons() 
     3.8 +											// <FS:Ansariel> FIRE-5141: Nearby chat floater can no longer be resized when all buttons are removed from bottom FUI panel
     3.9 +											//&& (mToolbars[i]->hasButtons() 
    3.10 +											&& ((i == LLToolBarEnums::TOOLBAR_BOTTOM ? true : mToolbars[i]->hasButtons())
    3.11 +											// </FS:Ansariel>
    3.12  											|| isToolDragged()));
    3.13  	}
    3.14  
     4.1 --- a/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml	Mon Dec 08 09:33:24 2014 +0100
     4.2 +++ b/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml	Thu Dec 11 11:05:24 2014 +0100
     4.3 @@ -253,7 +253,6 @@
     4.4  
     4.5    <!-- The toolbar itself -->
     4.6    <layout_panel name="toolbar_panel"
     4.7 -                force_resize_bar="true"
     4.8                  auto_resize="true"
     4.9                  user_resize="true"
    4.10                  height="30"
     5.1 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml	Mon Dec 08 09:33:24 2014 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml	Thu Dec 11 11:05:24 2014 +0100
     5.3 @@ -251,7 +251,6 @@
     5.4  
     5.5    <!-- The toolbar itself -->
     5.6    <layout_panel name="toolbar_panel"
     5.7 -                force_resize_bar="true"
     5.8                  auto_resize="true"
     5.9                  user_resize="true"
    5.10                  height="30"
     6.1 --- a/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml	Mon Dec 08 09:33:24 2014 +0100
     6.2 +++ b/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml	Thu Dec 11 11:05:24 2014 +0100
     6.3 @@ -255,7 +255,6 @@
     6.4  
     6.5    <!-- The toolbar itself -->
     6.6    <layout_panel name="toolbar_panel"
     6.7 -                force_resize_bar="true"
     6.8                  auto_resize="true"
     6.9                  user_resize="true"
    6.10                  height="30"
     7.1 --- a/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml	Mon Dec 08 09:33:24 2014 +0100
     7.2 +++ b/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml	Thu Dec 11 11:05:24 2014 +0100
     7.3 @@ -251,7 +251,6 @@
     7.4  
     7.5    <!-- The toolbar itself -->
     7.6    <layout_panel name="toolbar_panel"
     7.7 -                force_resize_bar="true"
     7.8                  auto_resize="true"
     7.9                  user_resize="true"
    7.10                  height="30"
     8.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml	Mon Dec 08 09:33:24 2014 +0100
     8.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml	Thu Dec 11 11:05:24 2014 +0100
     8.3 @@ -251,7 +251,6 @@
     8.4  
     8.5    <!-- The toolbar itself -->
     8.6    <layout_panel name="toolbar_panel"
     8.7 -                force_resize_bar="true"
     8.8                  auto_resize="true"
     8.9                  user_resize="true"
    8.10                  height="30"

mercurial