From 7572674fdb1d52d1c3f85420cdc3787d07e853f8 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 23 Jan 2014 19:07:53 -0500 Subject: [PATCH] Enforce xml follows flags in scroll containers, and allow the appearance floater to resize, enforcing minimum dimensions of its default size 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. --- indra/llui/llscrollcontainer.cpp | 6 +++++- indra/newview/skins/default/xui/en-us/floater_customize.xml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index f8998e40a..f7a658ad6 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -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 diff --git a/indra/newview/skins/default/xui/en-us/floater_customize.xml b/indra/newview/skins/default/xui/en-us/floater_customize.xml index cf223811b..aa49a6cb5 100644 --- a/indra/newview/skins/default/xui/en-us/floater_customize.xml +++ b/indra/newview/skins/default/xui/en-us/floater_customize.xml @@ -1,7 +1,7 @@