From 4eb72a12a2280d3be6ac556ad80eb953d249e8eb Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 9 Nov 2009 15:29:47 -0800
Subject: data driven layout of top-level UI elements EXT-1219 Side tray
 slide-out animation cleaned up some layout of bottom tray contents

reviewed by James
---
 indra/llui/lllayoutstack.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lllayoutstack.h')

diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 9ded48ef6a..11d604b7ec 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -38,7 +38,7 @@
 
 class LLPanel;
 
-class LLLayoutStack : public LLView
+class LLLayoutStack : public LLView, LLInstanceTracker<LLLayoutStack>
 {
 public:
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
@@ -81,6 +81,10 @@ public:
 	S32 getNumPanels() { return mPanels.size(); }
 
 	void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize);
+
+
+	static void idle();
+
 protected:
 	LLLayoutStack(const Params&);
 	friend class LLUICtrlFactory;
@@ -105,6 +109,8 @@ private:
 	S32 mMinHeight;  // calculated by calcMinExtents
 	S32 mPanelSpacing;
 
+	// true if we already applied animation this frame
+	bool mAnimatedThisFrame;
 	bool mAnimate;
 	bool mClip;
 }; // end class LLLayoutStack
-- 
cgit v1.2.3


From 2bc97bd68a774dd373c5688b5dc660abe90b37cc Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 9 Nov 2009 16:01:21 -0800
Subject: renamed LLLayoutStack::idle to LLLayoutStack::updateClass converted
 mWorldViewPlaceholder to a LLHandle<LLView> improved layout of
 panel_bottomtray

reviewed by James
---
 indra/llui/lllayoutstack.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/lllayoutstack.h')

diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 11d604b7ec..8475079f5e 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -83,7 +83,7 @@ public:
 	void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize);
 
 
-	static void idle();
+	static void updateClass();
 
 protected:
 	LLLayoutStack(const Params&);
-- 
cgit v1.2.3