diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:52:55 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 18:52:55 -0700 |
| commit | ca8bac23949c361eea2d33198a8211ed1d8f15c3 (patch) | |
| tree | 47dadd0308513c7302c5c5193b66436457d7f7b1 /indra/llui/lltoolbar.h | |
| parent | daae211fe3e2d1da3623951b1166473c53ce5808 (diff) | |
| parent | edacb7b3363dca6cd28a4ff7ea27154d6a30702f (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 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 10e5f49c0f..407cbde7d2 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -45,13 +45,11 @@ class LLToolBarButton : public LLButton public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { - Optional<S32> min_button_width, - max_button_width, - desired_height; + Optional<LLUI::Range<S32> > button_width; + Optional<S32> desired_height; Params() - : min_button_width("min_button_width", 0), - max_button_width("max_button_width", S32_MAX), + : button_width("button_width"), desired_height("desired_height", 20) {} @@ -69,8 +67,7 @@ private: LLCommandId mId; S32 mMouseDownX; S32 mMouseDownY; - S32 mMinWidth; - S32 mMaxWidth; + LLUI::Range<S32> mWidthRange; S32 mDesiredHeight; bool mIsDragged; startdrag_callback_t mStartDragItemCallback; @@ -152,7 +149,7 @@ public: void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); - + bool addCommand(const LLCommandId& commandId); bool hasCommand(const LLCommandId& commandId) const; bool enableCommand(const LLCommandId& commandId, bool enabled); |