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

Enforce xml follows flags in scroll containers, and allow the appearance floater to resize, enforcing minimum dimensions of its default size

Browse Source 
It was requested to let people resize the height to easily display more sections, and well, this is the easiest fix, if width changes in a nasty way, it can just be fixed since default is min.
This commit is contained in:
Lirusaito
2014-01-23 19:07:53 -05:00
parent 63379105b5
commit 7572674fdb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llscrollcontainer.cpp
View File

@@ -760,7 +760,7 @@ LLView* LLScrollContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
node->getAttributeString("name", name);
LLRect rect;
createRect(node, rect, parent, LLRect());
U32 follows_flags = createRect(node, rect, parent, LLRect());
BOOL opaque = FALSE;
node->getAttributeBOOL("opaque", opaque);
@@ -771,6 +771,10 @@ LLView* LLScrollContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
// Create the scroll view
LLScrollContainer *ret = new LLScrollContainer(name, rect, (LLPanel*)NULL, opaque, color);
// Obey xml follows
ret->setFollows(follows_flags);
ret->parseFollowsFlags(node);
LLPanel* panelp = NULL;
// Find a child panel to add