Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

Browse Source
This commit is contained in:
Shyotl
2013-05-17 16:46:40 -05:00
parent b1d69d05c3
commit df404c42d0
31 changed files with 109 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/CMakeLists.txt
View File

@@ -29,6 +29,7 @@ set(llui_SOURCE_FILES
llcheckboxctrl.cpp
llclipboard.cpp
llcombobox.cpp
llcontainerview.cpp
llctrlselectioninterface.cpp
lldraghandle.cpp
lleditmenuhandler.cpp
@@ -62,6 +63,9 @@ set(llui_SOURCE_FILES
llslider.cpp
llsliderctrl.cpp
llspinctrl.cpp
llstatbar.cpp
llstatgraph.cpp
llstatview.cpp
llstyle.cpp
lltabcontainer.cpp
lltextbox.cpp
@@ -90,6 +94,7 @@ set(llui_HEADER_FILES
llcheckboxctrl.h
llclipboard.h
llcombobox.h
llcontainerview.h
llctrlselectioninterface.h
lldraghandle.h
lleditmenuhandler.h
@@ -127,6 +132,9 @@ set(llui_HEADER_FILES
llslider.h
llsliderctrl.h
llspinctrl.h
llstatbar.h
llstatgraph.h
llstatview.h
llstyle.h
lltabcontainer.h
lltextbox.h

5
indra/newview/llcontainerview.cpp → indra/llui/llcontainerview.cpp
View File

@@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llcontainerview.h"
@@ -41,6 +41,7 @@
#include "llresmgr.h"
#include "llstring.h"
#include "llscrollcontainer.h"
#include "lluictrlfactory.h"
LLContainerView::LLContainerView(const LLContainerView::Params& p)
: LLView(p),
@@ -287,7 +288,7 @@ void LLContainerView::setDisplayChildren(const BOOL displayChildren)
}
}
void LLContainerView::setScrollContainer(LLScrollableContainerView* scroll)
void LLContainerView::setScrollContainer(LLScrollContainer* scroll)
{
mScrollContainer = scroll;
scroll->setPassBackToChildren(false);

17
indra/newview/llcontainerview.h → indra/llui/llcontainerview.h
View File

@@ -36,8 +36,9 @@
#include "stdtypes.h"
#include "lltextbox.h"
#include "llstatbar.h"
#include "llview.h"
class LLScrollableContainerView;
class LLScrollContainer;
class LLContainerView : public LLView
{
@@ -62,21 +63,21 @@ public:
~LLContainerView();
/*virtual*/ BOOL postBuild();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual void draw();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual LLRect getRequiredRect(); // Return the height of this object, given the set options.
/*virtual*/ void draw();
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/*virtual*/ LLRect getRequiredRect(); // Return the height of this object, given the set options.
void setLabel(const std::string& label);
void showLabel(BOOL show) { mShowLabel = show; }
void setDisplayChildren(const BOOL displayChildren);
BOOL getDisplayChildren() { return mDisplayChildren; }
void setScrollContainer(LLScrollableContainerView* scroll);
void setScrollContainer(LLScrollContainer* scroll);
private:
LLScrollableContainerView* mScrollContainer;
LLScrollContainer* mScrollContainer;
void arrange(S32 width, S32 height, BOOL called_from_parent = TRUE);
BOOL mShowLabel;

67
indra/llui/llscrollcontainer.cpp
View File

@@ -1,6 +1,6 @@
/**
* @file llscrollcontainer.cpp
* @brief LLScrollableContainerView base class
* @brief LLScrollContainer base class
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -33,8 +33,10 @@
#include "linden_common.h"
#include "llrender.h"
#include "llscrollcontainer.h"
#include "llrender.h"
#include "llcontainerview.h"
#include "lllocalcliprect.h"
#include "llscrollbar.h"
#include "llui.h"
@@ -44,6 +46,7 @@
#include "llfocusmgr.h"
#include "llframetimer.h"
#include "lluictrlfactory.h"
#include "llpanel.h"
#include "llfontgl.h"
///----------------------------------------------------------------------------
@@ -57,13 +60,13 @@ static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
///----------------------------------------------------------------------------
/// Class LLScrollableContainerView
/// Class LLScrollContainer
///----------------------------------------------------------------------------
static LLRegisterWidget<LLScrollableContainerView> r("scroll_container");
static LLRegisterWidget<LLScrollContainer> r("scroll_container");
// Default constructor
LLScrollableContainerView::LLScrollableContainerView( const std::string& name,
LLScrollContainer::LLScrollContainer( const std::string& name,
const LLRect& rect,
LLView* scrolled_view,
BOOL is_opaque,
@@ -128,7 +131,7 @@ LLScrollableContainerView::LLScrollableContainerView( const std::string& name,
}
// Destroys the object
LLScrollableContainerView::~LLScrollableContainerView( void )
LLScrollContainer::~LLScrollContainer( void )
{
// mScrolledView and mScrollbar are child views, so the LLView
// destructor takes care of memory deallocation.
@@ -141,9 +144,9 @@ LLScrollableContainerView::~LLScrollableContainerView( void )
// internal scrollbar handlers
// virtual
void LLScrollableContainerView::scrollHorizontal( S32 new_pos )
void LLScrollContainer::scrollHorizontal( S32 new_pos )
{
//llinfos << "LLScrollableContainerView::scrollHorizontal()" << llendl;
//llinfos << "LLScrollContainer::scrollHorizontal()" << llendl;
if( mScrolledView )
{
LLRect doc_rect = mScrolledView->getRect();
@@ -153,9 +156,9 @@ void LLScrollableContainerView::scrollHorizontal( S32 new_pos )
}
// virtual
void LLScrollableContainerView::scrollVertical( S32 new_pos )
void LLScrollContainer::scrollVertical( S32 new_pos )
{
// llinfos << "LLScrollableContainerView::scrollVertical() " << new_pos << llendl;
// llinfos << "LLScrollContainer::scrollVertical() " << new_pos << llendl;
if( mScrolledView )
{
LLRect doc_rect = mScrolledView->getRect();
@@ -165,7 +168,7 @@ void LLScrollableContainerView::scrollVertical( S32 new_pos )
}
// LLView functionality
void LLScrollableContainerView::reshape(S32 width, S32 height,
void LLScrollContainer::reshape(S32 width, S32 height,
BOOL called_from_parent)
{
LLUICtrl::reshape( width, height, called_from_parent );
@@ -192,7 +195,7 @@ void LLScrollableContainerView::reshape(S32 width, S32 height,
}
}
BOOL LLScrollableContainerView::handleKeyHere(KEY key, MASK mask)
BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
{
// allow scrolled view to handle keystrokes in case it delegated keyboard focus
// to the scroll container.
@@ -215,7 +218,7 @@ BOOL LLScrollableContainerView::handleKeyHere(KEY key, MASK mask)
return FALSE;
}
BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
{
// Give event to my child views - they may have scroll bars
// (Bad UI design, but technically possible.)
@@ -252,7 +255,7 @@ BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
return FALSE;
}
BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
@@ -273,7 +276,7 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
return TRUE;
}
bool LLScrollableContainerView::autoScroll(S32 x, S32 y)
bool LLScrollContainer::autoScroll(S32 x, S32 y)
{
S32 scrollbar_size = SCROLLBAR_SIZE;
@@ -346,7 +349,7 @@ bool LLScrollableContainerView::autoScroll(S32 x, S32 y)
}
BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
BOOL LLScrollContainer::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
{
S32 local_x, local_y;
for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
@@ -373,7 +376,7 @@ BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, std::string& msg, LL
return TRUE;
}
void LLScrollableContainerView::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
{
const LLRect& doc_rect = getScrolledViewRect();
S32 scrollbar_size = SCROLLBAR_SIZE;
@@ -410,7 +413,7 @@ void LLScrollableContainerView::calcVisibleSize( S32 *visible_width, S32 *visibl
}
}
void LLScrollableContainerView::draw()
void LLScrollContainer::draw()
{
S32 scrollbar_size = SCROLLBAR_SIZE;
if (mAutoScrolling)
@@ -503,7 +506,7 @@ void LLScrollableContainerView::draw()
} // end draw
bool LLScrollableContainerView::addChild(LLView* view, S32 tab_group)
bool LLScrollContainer::addChild(LLView* view, S32 tab_group)
{
if (!mScrolledView)
{
@@ -520,7 +523,7 @@ bool LLScrollableContainerView::addChild(LLView* view, S32 tab_group)
return ret_val;
}
void LLScrollableContainerView::updateScroll()
void LLScrollContainer::updateScroll()
{
if (!mScrolledView)
{
@@ -607,7 +610,7 @@ void LLScrollableContainerView::updateScroll()
mScrollbar[VERTICAL]->setPageSize( visible_height );
} // end updateScroll
void LLScrollableContainerView::setBorderVisible(BOOL b)
void LLScrollContainer::setBorderVisible(BOOL b)
{
mBorder->setVisible( b );
// Recompute inner rect, as border visibility changes it
@@ -615,7 +618,7 @@ void LLScrollableContainerView::setBorderVisible(BOOL b)
mInnerRect.stretch( -getBorderWidth() );
}
LLRect LLScrollableContainerView::getVisibleContentRect()
LLRect LLScrollContainer::getVisibleContentRect()
{
updateScroll();
LLRect visible_rect = getContentWindowRect();
@@ -623,7 +626,7 @@ LLRect LLScrollableContainerView::getVisibleContentRect()
visible_rect.translate(-contents_rect.mLeft, -contents_rect.mBottom);
return visible_rect;
}
LLRect LLScrollableContainerView::getContentWindowRect()
LLRect LLScrollContainer::getContentWindowRect()
{
updateScroll();
LLRect scroller_view_rect;
@@ -641,7 +644,7 @@ LLRect LLScrollableContainerView::getContentWindowRect()
}
// rect is in document coordinates, constraint is in display coordinates relative to content window rect
void LLScrollableContainerView::scrollToShowRect(const LLRect& rect, const LLRect& constraint)
void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLRect& constraint)
{
if (!mScrolledView)
{
@@ -692,31 +695,31 @@ void LLScrollableContainerView::scrollToShowRect(const LLRect& rect, const LLRec
notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
}
void LLScrollableContainerView::pageUp(S32 overlap)
void LLScrollContainer::pageUp(S32 overlap)
{
mScrollbar[VERTICAL]->pageUp(overlap);
updateScroll();
}
void LLScrollableContainerView::pageDown(S32 overlap)
void LLScrollContainer::pageDown(S32 overlap)
{
mScrollbar[VERTICAL]->pageDown(overlap);
updateScroll();
}
void LLScrollableContainerView::goToTop()
void LLScrollContainer::goToTop()
{
mScrollbar[VERTICAL]->setDocPos(0);
updateScroll();
}
void LLScrollableContainerView::goToBottom()
void LLScrollContainer::goToBottom()
{
mScrollbar[VERTICAL]->setDocPos(mScrollbar[VERTICAL]->getDocSize());
updateScroll();
}
S32 LLScrollableContainerView::getBorderWidth() const
S32 LLScrollContainer::getBorderWidth() const
{
if (mBorder && mBorder->getVisible())
{
@@ -727,7 +730,7 @@ S32 LLScrollableContainerView::getBorderWidth() const
}
// virtual
LLXMLNodePtr LLScrollableContainerView::getXML(bool save_children) const
LLXMLNodePtr LLScrollContainer::getXML(bool save_children) const
{
LLXMLNodePtr node = LLUICtrl::getXML();
@@ -751,7 +754,7 @@ LLXMLNodePtr LLScrollableContainerView::getXML(bool save_children) const
return node;
}
LLView* LLScrollableContainerView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
LLView* LLScrollContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
{
std::string name("scroll_container");
node->getAttributeString("name", name);
@@ -766,7 +769,7 @@ LLView* LLScrollableContainerView::fromXML(LLXMLNodePtr node, LLView *parent, LL
LLUICtrlFactory::getAttributeColor(node,"color", color);
// Create the scroll view
LLScrollableContainerView *ret = new LLScrollableContainerView(name, rect, (LLPanel*)NULL, opaque, color);
LLScrollContainer *ret = new LLScrollContainer(name, rect, (LLPanel*)NULL, opaque, color);
LLPanel* panelp = NULL;

8
indra/llui/llscrollcontainer.h
View File

@@ -1,6 +1,6 @@
/**
* @file llscrollcontainer.h
* @brief LLScrollableContainerView class header file.
* @brief LLScrollContainer class header file.
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -53,17 +53,17 @@ class LLUICtrlFactory;
* the width and height of the view you're scrolling.
*
*****************************************************************************/
class LLScrollableContainerView : public LLUICtrl
class LLScrollContainer : public LLUICtrl
{
public:
// Note: vertical comes before horizontal because vertical
// scrollbars have priority for mouse and keyboard events.
enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
LLScrollableContainerView( const std::string& name, const LLRect& rect,
LLScrollContainer( const std::string& name, const LLRect& rect,
LLView* scrolled_view, BOOL is_opaque = FALSE,
const LLColor4& bg_color = LLColor4(0,0,0,0) );
virtual ~LLScrollableContainerView( void );
virtual ~LLScrollContainer( void );
void setScrolledView(LLView* view) { mScrolledView = view; }

8
indra/newview/llstatbar.cpp → indra/llui/llstatbar.cpp
View File

@@ -30,7 +30,8 @@
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
//#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llstatbar.h"
@@ -40,6 +41,7 @@
#include "llfontgl.h"
#include "llstat.h"
#include "lluictrlfactory.h"
///////////////////////////////////////////////////////////////////////////////////
@@ -63,7 +65,7 @@ LLStatBar::LLStatBar(const std::string& name, const LLRect& rect, const std::str
S32 mode = -1;
if (mSetting.length() > 0)
{
mode = gSavedSettings.getS32(mSetting);
mode = LLUI::sConfigGroup->getS32(mSetting);
}
@@ -114,7 +116,7 @@ BOOL LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask)
mode |= STAT_HISTORY_FLAG;
}
gSavedSettings.setS32(mSetting, mode);
LLUI::sConfigGroup->setS32(mSetting, mode);
}

1
indra/newview/llstatbar.h → indra/llui/llstatbar.h
View File

@@ -35,7 +35,6 @@
#include "llview.h"
#include "llframetimer.h"
#include "llviewercontrol.h"
class LLStat;

7
indra/newview/llstatgraph.cpp → indra/llui/llstatgraph.cpp
View File

@@ -30,7 +30,8 @@
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
//#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llstatgraph.h"
#include "llrender.h"
@@ -40,7 +41,7 @@
#include "llstat.h"
#include "llgl.h"
#include "llglheaders.h"
#include "llviewercontrol.h"
//#include "llviewercontrol.h"
///////////////////////////////////////////////////////////////////////////////////
@@ -109,7 +110,7 @@ void LLStatGraph::draw()
// gColors.getColor("ColorDropShadow"),
// (S32) gSavedSettings.getF32("DropShadowFloater") );
static const LLCachedControl<LLColor4> menu_default_color(gColors,"MenuDefaultBgColor",LLColor4(0.f,0.f,0.f,1.f));
static const LLCachedControl<LLColor4> menu_default_color(*LLUI::sColorsGroup,"MenuDefaultBgColor",LLColor4(0.f,0.f,0.f,1.f));
color = menu_default_color;
gGL.color4fv(color.mV);
gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);

0
indra/newview/llstatgraph.h → indra/llui/llstatgraph.h
View File

10
indra/newview/llstatview.cpp → indra/llui/llstatview.cpp
View File

@@ -30,7 +30,7 @@
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "linden_common.h"
#include "llstatview.h"
@@ -39,11 +39,9 @@
#include "llfontgl.h"
#include "llgl.h"
#include "llui.h"
#include "lluictrlfactory.h"
#include "llstatbar.h"
#include "llviewercontrol.h"
#include "lluictrlfactory.h"
LLStatView::LLStatView(const LLStatView::Params& p)
: LLContainerView(p),
@@ -53,7 +51,7 @@ LLStatView::LLStatView(const LLStatView::Params& p)
BOOL isopen = getDisplayChildren();
if (mSetting.length() > 0)
{
isopen = gSavedSettings.getBOOL(mSetting);
isopen = LLUI::sConfigGroup->getBOOL(mSetting);
}
setDisplayChildren(isopen);
}
@@ -64,7 +62,7 @@ LLStatView::~LLStatView()
if (mSetting.length() > 0)
{
BOOL isopen = getDisplayChildren();
gSavedSettings.setBOOL(mSetting, isopen); /* Flawfinder: ignore */
LLUI::sConfigGroup->setBOOL(mSetting, isopen); /* Flawfinder: ignore */
}
}

0
indra/newview/llstatview.h → indra/llui/llstatview.h
View File

17
indra/llui/llui.cpp
View File

@@ -60,14 +60,15 @@ BOOL gShowTextEditCursor = TRUE;
std::map<std::string, std::string> gTranslation;
std::list<std::string> gUntranslated;
LLControlGroup* LLUI::sConfigGroup = NULL;
LLControlGroup* LLUI::sIgnoresGroup = NULL;
LLControlGroup* LLUI::sColorsGroup = NULL;
LLUIAudioCallback LLUI::sAudioCallback = NULL;
LLWindow* LLUI::sWindow = NULL;
LLHtmlHelp* LLUI::sHtmlHelp = NULL;
BOOL LLUI::sShowXUINames = FALSE;
BOOL LLUI::sQAMode = FALSE;
/*static*/ LLControlGroup* LLUI::sConfigGroup = NULL;
/*static*/ LLControlGroup* LLUI::sIgnoresGroup = NULL;
/*static*/ LLControlGroup* LLUI::sColorsGroup = NULL;
/*static*/ LLUIAudioCallback LLUI::sAudioCallback = NULL;
/*static*/ LLWindow* LLUI::sWindow = NULL;
/*static*/ LLView* LLUI::sRootView = NULL;
/*static*/ LLHtmlHelp* LLUI::sHtmlHelp = NULL;
/*static*/ BOOL LLUI::sShowXUINames = FALSE;
/*static*/ BOOL LLUI::sQAMode = FALSE;
//
// Functions

3
indra/llui/llui.h
View File

@@ -80,6 +80,8 @@ public:
static std::string getLanguage();
//helper functions (should probably move free standing rendering helper functions here)
static LLView* getRootView() { return sRootView; }
static void setRootView(LLView* view) { sRootView = view; }
static std::string locateSkin(const std::string& filename);
static void setMousePositionScreen(S32 x, S32 y);
static void getMousePositionScreen(S32 *x, S32 *y);
@@ -107,6 +109,7 @@ public:
static LLControlGroup* sColorsGroup;
static LLUIAudioCallback sAudioCallback;
static LLWindow* sWindow;
static LLView* sRootView;
static BOOL sShowXUINames;
static LLHtmlHelp* sHtmlHelp;

2
indra/llui/llview.cpp
View File

@@ -1164,7 +1164,7 @@ void LLView::drawChildren()
}*/
if (!mChildList.empty())
{
LLView* rootp = getRootView();
LLView* rootp = LLUI::getRootView();
++sDepth;
for (child_list_const_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend(); ++child_iter)

10
indra/newview/CMakeLists.txt
View File

@@ -135,7 +135,6 @@ set(viewer_SOURCE_FILES
llcompilequeue.cpp
llconfirmationmanager.cpp
llconsole.cpp
llcontainerview.cpp
llcurrencyuimanager.cpp
llcylinder.cpp
lldaycyclemanager.cpp
@@ -417,12 +416,8 @@ set(viewer_SOURCE_FILES
llsky.cpp
llspatialpartition.cpp
llsprite.cpp
llsrv.cpp
llstartup.cpp
llstatbar.cpp
llstatgraph.cpp
llstatusbar.cpp
llstatview.cpp
llstylemap.cpp
llsurface.cpp
llsurfacepatch.cpp
@@ -639,7 +634,6 @@ set(viewer_HEADER_FILES
llcompilequeue.h
llconfirmationmanager.h
llconsole.h
llcontainerview.h
llcurrencyuimanager.h
llcylinder.h
lldaycyclemanager.h
@@ -923,12 +917,8 @@ set(viewer_HEADER_FILES
llsky.h
llspatialpartition.h
llsprite.h
llsrv.h
llstartup.h
llstatbar.h
llstatgraph.h
llstatusbar.h
llstatview.h
llstylemap.h
llsurface.h
llsurfacepatch.h

4
indra/newview/llfloatercustomize.cpp
View File

@@ -558,8 +558,8 @@ const S32 HEADER_HEIGHT = 3 * (LINE_HEIGHT + LLFLOATER_VPAD) + (2 * LLPANEL_BORD
void LLFloaterCustomize::initScrollingPanelList()
{
LLScrollableContainerView* scroll_container =
getChild<LLScrollableContainerView>("panel_container");
LLScrollContainer* scroll_container =
getChild<LLScrollContainer>("panel_container");
// LLScrollingPanelList's do not import correctly
// mScrollingPanelList = LLUICtrlFactory::getScrollingPanelList(this, "panel_list");
mScrollingPanelList = new LLScrollingPanelList(std::string("panel_list"), LLRect());

4
indra/newview/llfloatercustomize.h
View File

@@ -54,7 +54,7 @@ class LLJoint;
class LLLineEditor;
class LLMakeOutfitDialog;
class LLRadioGroup;
class LLScrollableContainerView;
class LLScrollContainer;
class LLScrollingPanelList;
class LLTabContainer;
class LLTextBox;
@@ -142,7 +142,7 @@ private:
LLWearableType::EType mCurrentWearableType;
LLScrollingPanelList* mScrollingPanelList;
LLScrollableContainerView* mScrollContainer;
LLScrollContainer* mScrollContainer;
LLPointer<LLVisualParamReset> mResetParams;
LLInventoryObserver* mInventoryObserver;

2
indra/newview/llfloatergesture.h
View File

@@ -41,7 +41,7 @@
#include "lldarray.h"
class LLScrollableContainerView;
class LLScrollContainer;
class LLView;
class LLButton;
class LLLineEditor;

2
indra/newview/llfloaterpermissionsmgr.cpp
View File

@@ -81,7 +81,7 @@ LLFloaterPermissionsMgr::LLFloaterPermissionsMgr() :
LLRect scrollable_container_rect(0, y, getRect().getWidth(), 0);
LLRect permissions_rect(0, 0, getRect().getWidth() - HPAD - HPAD, 0);
mPermissions = new LLPermissionsView(permissions_rect);
mScroller = new LLScrollableContainerView(
mScroller = new LLScrollContainer(
std::string("permissions container"),
scrollable_container_rect,
mPermissions

4
indra/newview/llfloaterpermissionsmgr.h
View File

@@ -36,7 +36,7 @@
#include "llfloater.h"
#include <vector>
class LLScrollableContainerView;
class LLScrollContainer;
class LLPermissionsView;
class LLFloaterPermissionsMgr
@@ -59,7 +59,7 @@ public:
LLPermissionsView* mPermissions;
protected:
LLScrollableContainerView* mScroller;
LLScrollContainer* mScroller;
static LLFloaterPermissionsMgr* sInstance;
};

2
indra/newview/llfloaterstats.cpp
View File

@@ -728,7 +728,7 @@ LLFloaterStats::LLFloaterStats(const LLSD& val)
LLRect scroll_rect(LL_SCROLL_BORDER, getRect().getHeight() - LLFLOATER_HEADER_SIZE - LL_SCROLL_BORDER,
getRect().getWidth() - LL_SCROLL_BORDER, LL_SCROLL_BORDER);
mScrollContainer = new LLScrollableContainerView(std::string("statistics_scroll"), scroll_rect, mStatsContainer);
mScrollContainer = new LLScrollContainer(std::string("statistics_scroll"), scroll_rect, mStatsContainer);
mScrollContainer->setFollowsAll();
mScrollContainer->setReserveScrollCorner(TRUE);

4
indra/newview/llfloaterstats.h
View File

@@ -38,7 +38,7 @@
class LLContainerView;
class LLStatView;
class LLScrollableContainerView;
class LLScrollContainer;
class LLFloaterStats
: public LLFloater,
@@ -58,7 +58,7 @@ class LLFloaterStats
private:
void buildStats();
LLContainerView* mStatsContainer;
LLScrollableContainerView* mScrollContainer;
LLScrollContainer* mScrollContainer;
};
#endif

2
indra/newview/llfloatertest.cpp
View File

@@ -83,7 +83,7 @@ private:
LLRadioGroup* mRadioGroup;
LLRadioCtrl* mRadio1;
LLRadioCtrl* mRadio2;
LLScrollableContainerView* mScroll;
LLScrollContainer* mScroll;
LLScrollListCtrl* mScrollList;
LLTabContainer* mTab;
LLTextEditor* mTextEditor;

2
indra/newview/llfolderview.cpp
View File

@@ -2062,7 +2062,7 @@ void LLFolderView::scrollToShowItem(LLFolderViewItem* item, const LLRect& constr
}
}
void LLFolderView::setScrollContainer(LLScrollableContainerView* parent)
void LLFolderView::setScrollContainer(LLScrollContainer* parent)
{
mScrollContainer = parent;
parent->setPassBackToChildren(false);

6
indra/newview/llfolderview.h
View File

@@ -60,7 +60,7 @@ class LLInventoryModel;
class LLPanel;
class LLLineEditor;
class LLMenuGL;
class LLScrollableContainerView;
class LLScrollContainer;
class LLUICtrl;
class LLTextBox;
@@ -217,7 +217,7 @@ public:
void scrollToShowSelection();
void scrollToShowItem(LLFolderViewItem* item, const LLRect& constraint_rect);
void setScrollContainer(LLScrollableContainerView* parent);
void setScrollContainer(LLScrollContainer* parent);
LLRect getVisibleRect();
BOOL search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward);
@@ -258,7 +258,7 @@ private:
void updateRenamerPosition();
protected:
LLScrollableContainerView* mScrollContainer; // NULL if this is not a child of a scroll container.
LLScrollContainer* mScrollContainer; // NULL if this is not a child of a scroll container.
void commitRename( );
void onRenamerLost();

2
indra/newview/llinventorypanel.cpp
View File

@@ -201,7 +201,7 @@ BOOL LLInventoryPanel::postBuild()
// scroller
LLRect scroller_view_rect = getRect();
scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
mScroller = new LLScrollableContainerView(std::string("Inventory Scroller"),
mScroller = new LLScrollContainer(std::string("Inventory Scroller"),
scroller_view_rect,
mFolderRoot);
mScroller->setFollowsAll();

6
indra/newview/llinventorypanel.h
View File

@@ -57,7 +57,7 @@ class LLInventoryFVBridgeBuilder;
class LLMenuBarGL;
class LLCheckBoxCtrl;
class LLSpinCtrl;
class LLScrollableContainerView;
class LLScrollContainer;
class LLTextBox;
class LLIconCtrl;
class LLSaveFolderState;
@@ -126,7 +126,7 @@ public:
// This method is called when something has changed about the inventory.
void modelChanged(U32 mask);
LLFolderView* getRootFolder();
LLScrollableContainerView* getScrollableContainer() { return mScroller; }
LLScrollContainer* getScrollableContainer() { return mScroller; }
void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
@@ -164,7 +164,7 @@ protected:
BOOL mAllowMultiSelect;
LLFolderView* mFolderRoot;
LLScrollableContainerView* mScroller;
LLScrollContainer* mScroller;
/**
* Pointer to LLInventoryFVBridgeBuilder.

2
indra/newview/llpanelobjectinventory.cpp
View File

@@ -1629,7 +1629,7 @@ void LLPanelObjectInventory::reset()
mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS);
LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
mScroller = new LLScrollableContainerView(std::string("task inventory scroller"), scroller_rect, mFolders );
mScroller = new LLScrollContainer(std::string("task inventory scroller"), scroller_rect, mFolders );
mScroller->setFollowsAll();
addChild(mScroller);

4
indra/newview/llpanelobjectinventory.h
View File

@@ -32,7 +32,7 @@
#include "llinventory.h"
class LLScrollableContainerView;
class LLScrollContainer;
class LLFolderView;
class LLFolderViewFolder;
class LLViewerObject;
@@ -81,7 +81,7 @@ protected:
void clearContents();
private:
LLScrollableContainerView* mScroller;
LLScrollContainer* mScroller;
LLFolderView* mFolders;
LLUUID mTaskUUID;

1
indra/newview/llstartup.cpp
View File

@@ -157,7 +157,6 @@
#include "llsecondlifeurls.h"
#include "llselectmgr.h"
#include "llsky.h"
#include "llsrv.h"
#include "llstatview.h"
#include "llstatusbar.h" // sendMoneyBalanceRequest(), owns L$ balance
#include "llsurface.h"

1
indra/newview/llviewerwindow.cpp
View File

@@ -1662,6 +1662,7 @@ LLViewerWindow::LLViewerWindow(
rvp.mouse_opaque(false);
rvp.follows.flags(FOLLOWS_NONE);
mRootView = LLUICtrlFactory::create<LLRootView>(rvp);
LLUI::setRootView(mRootView);
// Make avatar head look forward at start
mCurrentMousePoint.mX = getWindowWidthScaled() / 2;