From 924e89114162d90ff42f67db31df70e12f41082f Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985@localhost>
Date: Sun, 24 Jun 2012 03:29:20 +0200
Subject: [PATCH] CHANGED: #1471 CGroupTab no longer depends on
 CInterfaceManager and the Ryzom game client time data.

---
 .../client/src/interface_v3/group_tab.cpp     | 39 ++++++-------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/group_tab.cpp b/code/ryzom/client/src/interface_v3/group_tab.cpp
index e9fe48a2e..c91b2f217 100644
--- a/code/ryzom/client/src/interface_v3/group_tab.cpp
+++ b/code/ryzom/client/src/interface_v3/group_tab.cpp
@@ -14,18 +14,12 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
-#include "stdpch.h"
-
 #include "group_tab.h"
 #include "nel/misc/xml_auto_ptr.h"
-#include "../time_client.h"
-#include "interface_manager.h"
-
 #include "nel/gui/lua_ihm.h"
-#include "lua_ihm_ryzom.h"
-
+#include "nel/gui/widget_manager.h"
+#include "nel/gui/interface_group.h"
+#include "nel/gui/view_text.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -131,10 +125,8 @@ void	CGroupTab::addTab(CCtrlTabButton * tabB)
 	selectFromCtrl(tabB);
 
 	if(_HideOutTabs && !_AHOnChange.empty())
-	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CAHManager::getInstance()->runActionHandler(_AHOnChange, this, _ParamsOnChange);
-	}
+
 }
 
 // ***************************************************************************
@@ -225,10 +217,8 @@ void	CGroupTab::addTab(CCtrlTabButton * tabB, sint index)
 	updateCoords();
 
 	if(_HideOutTabs && !_AHOnChange.empty())
-	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CAHManager::getInstance()->runActionHandler(_AHOnChange, this, _ParamsOnChange);
-	}
+
 }
 
 // ***************************************************************************
@@ -245,10 +235,8 @@ int CGroupTab::luaAddTab(CLuaState &ls)
 		updateCoords();
 
 		if(_HideOutTabs && !_AHOnChange.empty())
-		{
-			CInterfaceManager *pIM = CInterfaceManager::getInstance();
 			CAHManager::getInstance()->runActionHandler(_AHOnChange, this, _ParamsOnChange);
-		}
+
 	}
 	return 0;
 }
@@ -332,10 +320,7 @@ void	CGroupTab::removeTab(sint index)
 		select(_FirstTabIndex);
 
 		if(!_AHOnChange.empty())
-		{
-			CInterfaceManager *pIM = CInterfaceManager::getInstance();
 			CAHManager::getInstance()->runActionHandler(_AHOnChange, this, _ParamsOnChange);
-		}
 	}
 }
 
@@ -503,10 +488,8 @@ void CGroupTab::updateFirstTabButton()
 	}
 
 	if(!_AHOnChange.empty() && ((oldFirstTabIndex!=_FirstTabIndex) || (oldLastTabIndex!=_LastTabIndex)))
-	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CAHManager::getInstance()->runActionHandler(_AHOnChange, this, _ParamsOnChange);
-	}
+
 }
 
 // ***************************************************************************
@@ -797,9 +780,10 @@ bool CCtrlTabButton::handleEvent (const NLGUI::CEventDescriptor &event)
 		if (systemEvent.getEventTypeExtended() == NLGUI::CEventDescriptorSystem::clocktick)
 		if (_Blinking)
 		{
-			CInterfaceManager *pIM = CInterfaceManager::getInstance();
 			uint dbclickDelay = CWidgetManager::getInstance()->getUserDblClickDelay();
-			if ((T1 - _BlinkDate) > dbclickDelay)
+			const CWidgetManager::SInterfaceTimes &times = CWidgetManager::getInstance()->getInterfaceTimes();
+
+			if (( times.thisFrameMs - _BlinkDate) > dbclickDelay)
 			{
 				if (_BlinkState)
 				{
@@ -812,7 +796,7 @@ bool CCtrlTabButton::handleEvent (const NLGUI::CEventDescriptor &event)
 					setTextModulateGlobalColorNormal(_TextModulateGlobalColorNormalBlink);
 				}
 				_BlinkState = !_BlinkState;
-				_BlinkDate = T1;
+				_BlinkDate = times.thisFrameMs;
 			}
 		}
 	}
@@ -822,7 +806,6 @@ bool CCtrlTabButton::handleEvent (const NLGUI::CEventDescriptor &event)
 // ***************************************************************************
 void CCtrlTabButton::setBlink (bool b)
 {
-	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	if (b)
 	{
 		if (!_Blinking)