diff options
author | Mike Antipov <mantipov@productengine.com> | 2009-11-13 17:28:19 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2009-11-13 17:28:19 +0200 |
commit | 977b731dd6cb5ce0ef754633a2c95130ee016ee4 (patch) | |
tree | 1b78a5b44b0ca5afe74f1b05e5c8e078aae1368d /indra/newview/llbottomtray.h | |
parent | b59afa93961a30b8a5e4c6645b48c2cc8f3054df (diff) |
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Implemented functionality to process Buttons hidden/shown via context menu
1. hidden buttons are not processed while resizing
2. setTrayButtonVisibleIfPossible() is implemented:
* If it is impossible to show required button via context menu due to there is no enough room in bottom tray
* it will no be shown.
* Method also stores resize state to be processed while future bottom tray extending:
* - if hidden while resizing button should be hidden it will not be shown while extending;
* - if hidden via context menu button should be shown but there is no enough room for now
* it will be shown while extending.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r-- | indra/newview/llbottomtray.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index e88cd8edde..86d341f233 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -107,10 +107,26 @@ private: void processWidthIncreased(S32 delta_width); void log(LLView* panel, const std::string& descr); bool processShowButton(EResizeState shown_object_type, S32* available_width, S32* buttons_required_width); - void processHideButton(EResizeState shown_object_type, S32* required_width, S32* buttons_freed_width); - bool canButtonBeShown(LLPanel* panel) const; + void processHideButton(EResizeState processed_object_type, S32* required_width, S32* buttons_freed_width); + bool canButtonBeShown(EResizeState processed_object_type) const; void initStateProcessedObjectMap(); - void showTrayButton(EResizeState shown_object_type, bool visible); + + /** + * Sets passed visibility to object specified by resize type. + */ + void setTrayButtonVisible(EResizeState shown_object_type, bool visible); + + /** + * Sets passed visibility to object specified by resize type if it is possible. + * + * If it is impossible to show required button due to there is no enough room in bottom tray + * it will no be shown. Is called via context menu commands. + * Method also stores resize state to be processed while future bottom tray extending: + * - if hidden while resizing button should be hidden it will not be shown while extending; + * - if hidden via context menu button should be shown but there is no enough room for now + * it will be shown while extending. + */ + void setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible); MASK mResizeState; |