[Hgengine-cvs] SF.net SVN: hgengine:[647] Mercury2

[<cn...@us...>]

Revision: 647
          http://hgengine.svn.sourceforge.net/hgengine/?rev=647&view=rev
Author:   cnlohr
Date:     2010-01-10 22:13:44 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
rename Delegate to MessageDelegate since we will have multiple types.  Also, add a little bit to Cu2

Modified Paths:
--------------
    Mercury2/modules/Cu2.cpp
    Mercury2/modules/Cu2.h
    Mercury2/src/MercuryMessageManager.cpp
    Mercury2/src/MercuryMessageManager.h

Modified: Mercury2/modules/Cu2.cpp
===================================================================
--- Mercury2/modules/Cu2.cpp	2009-12-29 15:52:06 UTC (rev 646)
+++ Mercury2/modules/Cu2.cpp	2010-01-10 22:13:44 UTC (rev 647)
@@ -558,7 +558,16 @@
 	}
 }
 
+void Cu2Dialog::UpdateSize()
+{
+	if( m_pTitle )
+	{
+		m_pTitle->SetShiftY( GetH() - 18 );
+		m_pTitle->RenderText();
+	}
+}
 
+
 REGISTER_NODE_TYPE(Cu2Dialog);
 
 

Modified: Mercury2/modules/Cu2.h
===================================================================
--- Mercury2/modules/Cu2.h	2009-12-29 15:52:06 UTC (rev 646)
+++ Mercury2/modules/Cu2.h	2010-01-10 22:13:44 UTC (rev 647)
@@ -45,6 +45,9 @@
 	///Called when a key is pressed - down the focus line.
 	virtual void GetKeypress( int key, bool bDown, bool bRepeat );
 
+	///Called whenever the element is resized.
+	virtual void UpdateSize() { }
+
 	//Below here - you run into functions that are seldom overloaded.
 
 	///Handle updating of tab information
@@ -88,7 +91,7 @@
 	float GetY() { return m_fY; }
 
 	///Set Width/Height
-	void SetSize( float fW, float fH ) { m_fW = fW; m_fH = fH; }
+	void SetSize( float fW, float fH ) { m_fW = fW; m_fH = fH; UpdateSize(); }
 	///Set Width
 	void SetW( float fW ) { m_fW = fW; }
 	///Set Height
@@ -185,6 +188,7 @@
 	virtual void Render( const MercuryMatrix& m );
 	virtual int MouseMotion( int x, int y, unsigned char iCurrentButtonMask, unsigned char iLastButtonMask );
 	virtual void MouseAction( int x, int y, Cu2Action c, int iWhichButton );
+	virtual void UpdateSize();
 
 	void SetText( const MString & sText );
 

Modified: Mercury2/src/MercuryMessageManager.cpp
===================================================================
--- Mercury2/src/MercuryMessageManager.cpp	2009-12-29 15:52:06 UTC (rev 646)
+++ Mercury2/src/MercuryMessageManager.cpp	2010-01-10 22:13:44 UTC (rev 647)
@@ -94,7 +94,7 @@
 	
 }
 
-void MercuryMessageManager::RegisterForMessage(const MString& message, MessageHandler* ptr,  Delegate d )
+void MercuryMessageManager::RegisterForMessage(const MString& message, MessageHandler* ptr,  MessageDelegate d )
 {
 	MSemaphoreLock lock(&m_recipientLock);
 	m_messageRecipients[message].push_back(MessagePair(ptr, d));

Modified: Mercury2/src/MercuryMessageManager.h
===================================================================
--- Mercury2/src/MercuryMessageManager.h	2009-12-29 15:52:06 UTC (rev 646)
+++ Mercury2/src/MercuryMessageManager.h	2010-01-10 22:13:44 UTC (rev 647)
@@ -24,7 +24,7 @@
 		static bool Compare( void * left, void * right );
 };
 
-typedef void (MessageHandler::*Delegate)(const MessageData&);
+typedef void (MessageHandler::*MessageDelegate)(const MessageData&);
 
 /* This message system uses absolute integer time values to fire off events.
 This ensures accuarate firing times while eliminating floating point error.
@@ -44,7 +44,7 @@
 
 		void PumpMessages(const uint64_t& currTime);
 		
-		void RegisterForMessage(const MString& message, MessageHandler* ptr,  Delegate d = 0 );
+		void RegisterForMessage(const MString& message, MessageHandler* ptr,  MessageDelegate d = 0 );
 		void UnRegisterForMessage(const MString& message, MessageHandler* ptr);
 		
 		static MercuryMessageManager& GetInstance();
@@ -57,9 +57,9 @@
 
 		struct MessagePair
 		{
-			MessagePair( MessageHandler * th, Delegate td ) : h(th), d(td) { }
+			MessagePair( MessageHandler * th, MessageDelegate td ) : h(th), d(td) { }
 			MessageHandler * h;
-			Delegate d;
+			MessageDelegate d;
 		};
 
 		MHash< std::list< MessagePair > > m_messageRecipients;
@@ -72,7 +72,7 @@
 static InstanceCounter<MercuryMessageManager> MMcounter("MessageManager");
 
 #define MESSAGEMAN MercuryMessageManager::GetInstance()
-#define REGISTER_MESSAGE_WITH_DELEGATE(x, d) MESSAGEMAN.RegisterForMessage(x, this, (Delegate)d)
+#define REGISTER_MESSAGE_WITH_DELEGATE(x, d) MESSAGEMAN.RegisterForMessage(x, this, (MessageDelegate)d)
 #define REGISTER_FOR_MESSAGE(x) MESSAGEMAN.RegisterForMessage(x, this)
 #define UNREGISTER_FOR_MESSAGE(x) MESSAGEMAN.UnRegisterForMessage(x, this)
 #define POST_MESSAGE(x,data,delay) MESSAGEMAN.PostMessage(x, data, delay)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.