diff options
| author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
| commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
| tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/llui/llflyoutbutton.cpp | |
| parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
| parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) | |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/llui/llflyoutbutton.cpp')
| -rw-r--r-- | indra/llui/llflyoutbutton.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp index 8846f2a8c4..536919c072 100644 --- a/indra/llui/llflyoutbutton.cpp +++ b/indra/llui/llflyoutbutton.cpp @@ -35,7 +35,7 @@ // file includes #include "llflyoutbutton.h" -//static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button"); +//static LLDefaultChildRegistry::Register<LLFlyoutButton> r2("flyout_button"); const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24; @@ -54,11 +54,6 @@ LLFlyoutButton::LLFlyoutButton(const Params& p) mActionButton = LLUICtrlFactory::create<LLButton>(bp); addChild(mActionButton); - - mButton->setOrigin(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0); - mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight()); - mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM); - mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT); } void LLFlyoutButton::onActionButtonClick(const LLSD& data) @@ -75,7 +70,7 @@ void LLFlyoutButton::draw() //FIXME: this should be an attribute of comboboxes, whether they have a distinct label or // the label reflects the last selected item, for now we have to manually remove the label - mButton->setLabel(LLStringUtil::null); + setLabel(LLStringUtil::null); LLComboBox::draw(); } |