diff options
| author | Richard Linden <none@none> | 2011-09-22 17:36:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-22 17:36:04 -0700 |
| commit | 0c5d69b662b97d7716c2b00baccd112eb1c6ec98 (patch) | |
| tree | 111520a9d87a1d5af866f30c4a78d104da2747ff /indra/llui/lltoolbar.h | |
| parent | 565483ee1f2ea7b8d525c6d89700452216481c5e (diff) | |
| parent | c155483fc206768e21d180fac9ccdd85db8f582e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 85cd6d5170..9b08b26ce4 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -99,7 +99,8 @@ public: Optional<bool> wrap; Optional<S32> min_button_width, - max_button_width; + max_button_width, + button_height; // get rid of this Multiple<LLToolBarButton::Params> buttons; @@ -122,6 +123,7 @@ protected: private: void updateLayoutAsNeeded(); + void resizeButtonsInRow(std::vector<LLToolBarButton*>& buttons_in_row, S32 max_row_girth); std::list<LLToolBarButton*> mButtons; LLToolBarEnums::ButtonType mButtonType; @@ -133,7 +135,8 @@ private: bool mWrap; bool mNeedsLayout; S32 mMinButtonWidth, - mMaxButtonWidth; + mMaxButtonWidth, + mButtonHeight; LLUIImagePtr mBackgroundImage; |