From 117e22047c5752352342d64e3fb7ce00a4eb8113 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:04 -0500
Subject: Second Life viewer sources 1.18.1.2

---
 linden/indra/llui/llfloater.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llui/llfloater.h')

diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 8b610e3..baa192a 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -143,8 +143,10 @@ public:
 
 	void			setTitle( const LLString& title );
 	const LLString&		getTitle() const;
+	void			setShortTitle( const LLString& short_title );
+	LLString		getShortTitle();
 	virtual void	setMinimized(BOOL b);
-	void			moveResizeHandleToFront();
+	void			moveResizeHandlesToFront();
 	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE);
 	void			addDependentFloater(LLViewHandle dependent_handle, BOOL reposition = TRUE);
 	LLFloater*              getDependee() { return (LLFloater*)LLFloater::getFloaterByHandle(mDependeeHandle); }
@@ -242,6 +244,7 @@ protected:
 	LLRect			mPreviousRect;
 	BOOL			mForeground;
 	LLViewHandle	mDependeeHandle;
+	LLString		mShortTitle;
 
 	BOOL			mFirstLook;			// TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.
 
@@ -281,6 +284,10 @@ protected:
 	static handle_map_t	sFloaterMap;
 
 	std::vector<LLView*> mMinimizedHiddenChildren;
+
+	BOOL			mHasBeenDraggedWhileMinimized;
+	S32				mPreviousMinimizedBottom;
+	S32				mPreviousMinimizedLeft;
 };
 
 /////////////////////////////////////////////////////////////
@@ -367,12 +374,11 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ void setVisible(BOOL visible);
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
-
 	/*virtual*/ EWidgetType getWidgetType() const;
 	/*virtual*/ LLString getWidgetTag() const;
 
 	virtual void setCanResize(BOOL can_resize);
-	virtual void growToFit(LLFloater* floaterp, S32 width, S32 height);
+	virtual void growToFit(S32 content_width, S32 content_height);
 	virtual void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainerCommon::eInsertionPoint insertion_point = LLTabContainerCommon::END);
 
 	virtual void showFloater(LLFloater* floaterp);
@@ -394,7 +400,7 @@ public:
 	void setTabContainer(LLTabContainerCommon* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
 	static void onTabSelected(void* userdata, bool);
 
-	virtual void resizeToContents();
+	virtual void updateResizeLimits();
 
 protected:
 	struct LLFloaterData
-- 
cgit v1.1