From 0a095bdaed81f4df90bceac3373fa3481787e7fb Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Wed, 11 Nov 2009 12:19:54 -0800
Subject: added stylized text to tooltips for showxuinames

---
 indra/llui/lltooltip.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

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

diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 30d251266c..6e9cb8b434 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -37,6 +37,7 @@
 #include "llsingleton.h"
 #include "llinitparam.h"
 #include "llpanel.h"
+#include "llstyle.h"
 
 //
 // Classes
@@ -65,11 +66,19 @@ public:
 class LLToolTip : public LLPanel
 {
 public:
+
+	struct StyledText : public LLInitParam::Block<StyledText>
+	{
+		Mandatory<std::string>		text;
+		Optional<LLStyle::Params>	style;
+	};
+
 	struct Params : public LLInitParam::Block<Params, LLPanel::Params> 
 	{
 		typedef boost::function<void(void)> click_callback_t;
 
-		Mandatory<std::string>		message;
+		Optional<std::string>		message;
+		Multiple<StyledText>		styled_message;
 
 		Optional<LLCoordGL>			pos;
 		Optional<F32>				delay_time,
@@ -85,8 +94,8 @@ public:
 		Optional<click_callback_t>	click_callback,
 									click_playmedia_callback,
 									click_homepage_callback;
-		Optional<S32>				max_width;
-		Optional<S32>				padding;
+		Optional<S32>				max_width,
+									padding;
 		Optional<bool>				wrap;
 
 		Params();
@@ -94,7 +103,6 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
 	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-	/*virtual*/ void setValue(const LLSD& value);
 	/*virtual*/ void setVisible(BOOL visible);
 
 	bool isFading();
@@ -102,6 +110,7 @@ public:
 	bool hasClickCallback();
 
 	LLToolTip(const Params& p);
+	void initFromParams(const LLToolTip::Params& params);
 
 private:
 	class LLTextBox*	mTextBox;
@@ -111,7 +120,6 @@ private:
 
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer	mVisibleTimer;
-	S32				mMaxWidth;
 	bool			mHasClickCallback;
 	S32				mPadding;	// pixels
 };
-- 
cgit v1.2.3