diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
commit | 77876a3c4f18b480f9afd17be57b123d2e5f1e84 (patch) | |
tree | 04b31f26cceef5cc411b166d30eb694707d995aa /indra/newview/llfavoritesbar.h | |
parent | e0f6e449594c44511d9634ea54faf54f8fe5cb7c (diff) | |
parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) |
Merged with viewer-development.
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
-rw-r--r-- | indra/newview/llfavoritesbar.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 1a28731c4f..1b11d6196e 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -34,13 +34,16 @@ #include "llinventoryobserver.h" #include "llinventorymodel.h" +class LLMenuItemCallGL; +class LLToggleableMenu; + class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver { public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { Optional<LLUIImage*> image_drag_indication; - Optional<LLButton::Params> chevron_button; + Optional<LLTextBox::Params> more_button; Optional<LLTextBox::Params> label; Params(); }; @@ -132,10 +135,21 @@ private: // finds an item by it's UUID in the items array LLInventoryModel::item_array_t::iterator findItemByUUID(LLInventoryModel::item_array_t& items, const LLUUID& id); + void createOverflowMenu(); + + void updateMenuItems(LLToggleableMenu* menu); + + // Fits menu item label width with favorites menu width + void fitLabelWidth(LLMenuItemCallGL* menu_item); + + void addOpenLandmarksMenuItem(LLToggleableMenu* menu); + + void positionAndShowMenu(LLToggleableMenu* menu); + BOOL mShowDragMarker; LLUICtrl* mLandingTab; LLUICtrl* mLastTab; - LLButton* mChevronButton; + LLTextBox* mMoreTextBox; LLTextBox* mBarLabel; LLUUID mDragItemId; |