livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

meow-7.2.2
Richard Linden 2011-09-27 09:41:09 -07:00
parent b7cf5ff947 c5d930b280
commit f0095ddd23
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llpanel.h
View File

@ -96,9 +96,6 @@ public:
Params();
};
// valid children for LLPanel are stored in this registry
typedef LLDefaultChildRegistry child_registry_t;
protected:
friend class LLUICtrlFactory;
// RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8

11
indra/llui/lltoolbar.cpp
View File

@ -30,6 +30,7 @@
#include <boost/foreach.hpp>
#include "lltoolbar.h"
#include "llcommandmanager.h"
#include "llmenugl.h"
#include "lltrans.h"
@ -368,8 +369,8 @@ void LLToolBar::updateLayoutAsNeeded()
std::vector<LLToolBarButton*> buttons_in_row;
BOOST_FOREACH(LLToolBarButton* button, mButtons)
{
BOOST_FOREACH(LLToolBarButton* button, mButtons)
{
button->reshape(mMinButtonWidth, mButtonHeight);
button->autoResize();
@ -402,8 +403,8 @@ void LLToolBar::updateLayoutAsNeeded()
max_row_girth = 0;
}
LLRect button_rect;
if (orientation == LLLayoutStack::HORIZONTAL)
LLRect button_rect;
if (orientation == LLLayoutStack::HORIZONTAL)
{
button_rect.setLeftTopAndSize(cur_start, panel_rect.mTop - cur_row, button_clamped_width, button->getRect().getHeight());
}
@ -448,7 +449,7 @@ void LLToolBar::updateLayoutAsNeeded()
reshape(total_girth, getRect().getHeight());
mButtonPanel->reshape(total_girth, max_row_length);
}
}
// re-center toolbar buttons
mCenteringStack->updateLayout();

6
indra/llui/llview.h
View File

@ -95,9 +95,6 @@ private:
static std::vector<LLViewDrawContext*> sDrawContextStack;
};
class LLViewWidgetRegistry : public LLChildRegistry<LLViewWidgetRegistry>
{};
class LLView : public LLMouseHandler, public LLMortician, public LLFocusableElement
{
public:
@ -150,7 +147,8 @@ public:
Params();
};
typedef LLViewWidgetRegistry child_registry_t;
// most widgets are valid children of LLView
typedef LLDefaultChildRegistry child_registry_t;
void initFromParams(const LLView::Params&);