merge

1 files changed, 173 insertions, 16 deletions

diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 8395b484cf..c0887df39a 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -120,37 +120,153 @@ private:
 		, RS_BUTTON_SPEAK		= 0x0040
 		, RS_IM_WELL			= 0x0080
 		, RS_NOTIFICATION_WELL	= 0x0100
+		, RS_BUTTON_BUILD		= 0x0200
+		, RS_BUTTON_SEARCH		= 0x0400
+		, RS_BUTTON_WORLD_MAP	= 0x0800
+		, RS_BUTTON_MINI_MAP	= 0x1000
+		, RS_BUTTON_SIDEBAR		= 0x2000
+
+		/*
+		Once new button that can be hidden on resize is added don't forget to update related places:
+			- RS_BUTTONS_CAN_BE_HIDDEN enum value below.
+			- initResizeStateContainers(): mStateProcessedObjectMap and mButtonsProcessOrder
+		*/
 
 		/**
 		 * Specifies buttons which can be hidden when bottom tray is shrunk.
 		 * They are: Gestures, Movement (Move), Camera (View), Snapshot
+		 *		new: Build, Search, Map, World Map, Mini-Map.
 		 */
 		, RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES
+									| RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP
+									| RS_BUTTON_SIDEBAR
 	}EResizeState;
 
+	/**
+	 * Updates child controls size and visibility when it is necessary to reduce total width.
+	 *
+	 * Process order:
+	 *	- reduce chiclet panel to its minimal width;
+	 *  - reduce chatbar to its minimal width;
+	 *  - reduce visible buttons from right to left to their minimal width;
+	 *  - hide visible buttons from right to left;
+	 * When button is hidden chatbar extended to fill released space if it is necessary.
+	 *
+	 * @param[in] delta_width - value by which bottom tray should be shrunk. It is a negative value.
+	 * @return positive value which bottom tray can not process when it reaches its minimal width.
+	 *		Zero if there was enough space to process delta_width.
+	 */
 	S32 processWidthDecreased(S32 delta_width);
+
+	/**
+	 * Updates child controls size and visibility when it is necessary to extend total width.
+	 *
+	 * Process order:
+	 *  - show invisible buttons should be shown from left to right if possible;
+	 *  - extend visible buttons from left to right to their default width;
+	 *  - extend chatbar to its maximal width;
+	 *	- extend chiclet panel to all available space;
+	 * When chatbar & chiclet panels are wider then their minimal width they can be reduced to allow
+	 * a button gets visible in case if passed delta_width is not enough (chatbar first).
+	 *
+	 * @param[in] delta_width - value by which bottom tray should be extended. It is a positive value.
+	 */
 	void processWidthIncreased(S32 delta_width);
+
+	/** helper function to log debug messages */
 	void log(LLView* panel, const std::string& descr);
-	bool processShowButton(EResizeState shown_object_type, S32* available_width);
-	void processHideButton(EResizeState processed_object_type, S32* required_width, S32* buttons_freed_width);
+
+	/**
+	 * Tries to show hidden by resize buttons using available width.
+	 *
+	 * Gets buttons visible if there is enough space. Reduces available_width in this case.
+	 *
+	 * @params[in, out] available_width - reference to available width to be used to show buttons.
+	 * @see processShowButton()
+	 */
+	void processShowButtons(S32& available_width);
+
+	/**
+	 * Tries to show panel with specified button using available width.
+	 *
+	 * Shows button specified by type if there is enough space. Reduces available_width in this case.
+	 *
+	 * @params[in] shown_object_type - type of button to be shown.
+	 * @params[in, out] available_width - reference to available width to be used to show button.
+	 *
+	 * @return true if button can be shown, false otherwise
+	 */
+	bool processShowButton(EResizeState shown_object_type, S32& available_width);
+
+	/**
+	 * Hides visible panels with all buttons that may be hidden by resize if it is necessary.
+	 *
+	 * When button gets hidden some space is released in bottom tray.
+	 * This space is taken into account for several consecutive calls for several buttons.
+	 *
+	 * @params[in, out] required_width - reference to required width to be released. This is a negative value.
+	 *			Its absolute value is decreased by shown panel width.
+	 * @params[in, out] buttons_freed_width - reference to value released over required one.
+	 *			If panel's width is more than required difference is added to buttons_freed_width.
+	 * @see processHideButton()
+	 */
+	void processHideButtons(S32& required_width, S32& buttons_freed_width);
+
+	/**
+	 * Hides panel with specified button if it is visible.
+	 *
+	 * When button gets hidden some space is released in bottom tray.
+	 * This space is taken into account for several consecutive calls for several buttons.
+	 *
+	 * @params[in] processed_object_type - type of button to be hide.
+	 * @params[in, out] required_width - reference to required width to be released. This is a negative value.
+	 *			Its absolute value is decreased by panel width.
+	 * @params[in, out] buttons_freed_width - reference to value released over required one.
+	 *			If panel's width is more than required difference is added to buttons_freed_width.
+	 */
+	void processHideButton(EResizeState processed_object_type, S32& required_width, S32& buttons_freed_width);
 
 	/**
 	 * Shrinks shown buttons to reduce total taken space.
 	 *
-	 * @param - required_width - width which buttons can use to be shrunk. It is a negative value.
+	 * Shrinks buttons that may be shrunk smoothly first. Then shrinks Speak button.
+	 *
+	 * @param[in, out] required_width - reference to width value which should be released when buttons are shrunk. It is a negative value.
 	 * It is increased on the value processed by buttons.
+	 * @params[in, out] buttons_freed_width - reference to value released over required one.
+	 *			If width of panel with Speak button is more than required that difference is added
+	 *				to buttons_freed_width.
+	 *			This is because Speak button shrinks discretely unlike other buttons which are changed smoothly.
 	 */
-	void processShrinkButtons(S32* required_width, S32* buttons_freed_width);
-	void processShrinkButton(EResizeState processed_object_type, S32* required_width);
+	void processShrinkButtons(S32& required_width, S32& buttons_freed_width);
+
+	/**
+	 * Shrinks panel with specified button if it is visible.
+	 *
+	 * @params[in] processed_object_type - type of button to be shrunk.
+	 * @param[in, out] required_width - reference to width value which should be released when button is shrunk. It is a negative value.
+	 * It is increased on the value released by the button.
+	 */
+	void processShrinkButton(EResizeState processed_object_type, S32& required_width);
 
 	/**
 	 * Extends shown buttons to increase total taken space.
 	 *
-	 * @param - available_width - width which buttons can use to be extended. It is a positive value.
-	 * It is decreased on the value processed by buttons.
+	 * Extends buttons that may be extended smoothly first. Then extends Speak button.
+	 *
+	 * @param[in, out] available_width - reference to width value which buttons can use to be extended.
+	 *		It is a positive value. It is decreased on the value processed by buttons.
+	 */
+	void processExtendButtons(S32& available_width);
+
+	/**
+	 * Extends shown button to increase total taken space.
+	 *
+	 * @params[in] processed_object_type - type of button to be extended.
+	 * @param[in, out] available_width - reference to width value which button can use to be extended.
+	 *		It is a positive value. It is decreased on the value processed by buttons.
 	 */
-	void processExtendButtons(S32* available_width);
-	void processExtendButton(EResizeState processed_object_type, S32* available_width);
+	void processExtendButton(EResizeState processed_object_type, S32& available_width);
 
 	/**
 	 * Determines if specified by type object can be shown. It should be hidden by shrink before.
@@ -159,7 +275,37 @@ private:
 	 *   - Gestures, Move, View, Snapshot
 	 */
 	bool canButtonBeShown(EResizeState processed_object_type) const;
-	void initStateProcessedObjectMap();
+
+	/**
+	 * Initializes all containers stored data related to children resize state.
+	 *
+	 * @see mStateProcessedObjectMap
+	 * @see mObjectDefaultWidthMap
+	 * @see mButtonsProcessOrder
+	 */
+	void initResizeStateContainers();
+
+	/**
+	 * Initializes buttons' visibility depend on stored Control Settings.
+	 */
+	void initButtonsVisibility();
+
+	/**
+	 * Initializes listeners of Control Settings to toggle appropriate buttons' visibility.
+	 *
+	 * @see toggleShowButton()
+	 */
+	void setButtonsControlsAndListeners();
+
+	/**
+	 * Toggles visibility of specified button depend on passed value.
+	 *
+	 * @param button_type - type of button to be toggled
+	 * @param new_visibility - new visibility of the button
+	 *
+	 * @see setButtonsControlsAndListeners()
+	 */
+	static bool toggleShowButton(EResizeState button_type, const LLSD& new_visibility);
 
 	/**
 	 * Sets passed visibility to object specified by resize type.
@@ -197,6 +343,17 @@ private:
 	 */
 	void showWellButton(EResizeState object_type, bool visible);
 
+	/**
+	 * Handles a customization of chatbar width.
+	 *
+	 * When chatbar gets wider layout stack will reduce chiclet panel (it is auto-resizable)
+	 *	But once chiclet panel reaches its minimal width Stack will force to reduce buttons width.
+	 *	including Speak button. The similar behavior is when chatbar gets narrowly.
+	 * This methods force resize behavior to resize buttons properly in these cases.
+	 */
+	void processChatbarCustomization(S32 new_width);
+
+
 	MASK mResizeState;
 
 	typedef std::map<EResizeState, LLPanel*> state_object_map_t;
@@ -205,8 +362,12 @@ private:
 	typedef std::map<EResizeState, S32> state_object_width_map_t;
 	state_object_width_map_t mObjectDefaultWidthMap;
 
-	typedef std::map<EResizeState, LLUICtrl*> dummies_map_t;
-	dummies_map_t mDummiesMap;
+	typedef std::vector<EResizeState> resize_state_vec_t;
+
+	/**
+	 * Contains order in which child buttons should be processed in show/hide, extend/shrink methods.
+	 */
+	resize_state_vec_t mButtonsProcessOrder;
 
 protected:
 
@@ -224,10 +385,6 @@ protected:
 	LLNearbyChatBar*	mNearbyChatBar;
 	LLLayoutStack*		mToolbarStack;
 	LLMenuGL*			mBottomTrayContextMenu;
-	LLPanel*			mMovementPanel;
-	LLPanel*			mCamPanel;
-	LLPanel*			mSnapshotPanel;
-	LLPanel*			mGesturePanel;
 	LLButton*			mCamButton;
 	LLButton*			mMovementButton;
 	LLBottomTrayLite*   mBottomTrayLite;