Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

CHANGED: #1471 CGroupScrollText no longer depends on the Ryzom client time data.

Browse source 
--HG--
branch : gui-refactoring
This commit is contained in:
dfighter1985 2012-06-23 21:03:23 +02:00
parent b9ac80f41a
commit b1f9abd903
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/ryzom/client/src/interface_v3/group_scrolltext.cpp
View file

@ -14,21 +14,14 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h"
#include "group_scrolltext.h" #include "group_scrolltext.h"
#include "nel/gui/group_list.h" #include "nel/gui/group_list.h"
#include "nel/gui/view_text.h" #include "nel/gui/view_text.h"
#include "nel/gui/ctrl_scroll.h" #include "nel/gui/ctrl_scroll.h"
#include "nel/gui/ctrl_button.h" #include "nel/gui/ctrl_button.h"
#include "nel/gui/action_handler.h" #include "nel/gui/action_handler.h"
#include "../time_client.h"
#include "nel/misc/i18n.h" #include "nel/misc/i18n.h"
#include "nel/gui/widget_manager.h"
NLMISC_REGISTER_OBJECT(CViewBase, CGroupScrollText, std::string, "scroll_text"); NLMISC_REGISTER_OBJECT(CViewBase, CGroupScrollText, std::string, "scroll_text");
@ -204,13 +197,15 @@ class CSTUp : public IActionHandler
public: public:
virtual void execute (CCtrlBase *pCaller, const std::string &/* Params */) virtual void execute (CCtrlBase *pCaller, const std::string &/* Params */)
{ {
const CWidgetManager::SInterfaceTimes &times = CWidgetManager::getInstance()->getInterfaceTimes();
CGroupScrollText *pST = dynamic_cast<CGroupScrollText*>(pCaller->getParent()); CGroupScrollText *pST = dynamic_cast<CGroupScrollText*>(pCaller->getParent());
if (pST == NULL) return; if (pST == NULL) return;
if (pST->getList() == NULL) return; if (pST->getList() == NULL) return;
// get the font height from the text template of the list // get the font height from the text template of the list
const CViewText *vt = pST->getList()->getTextTemplatePtr(); const CViewText *vt = pST->getList()->getTextTemplatePtr();
if (!vt) return; if (!vt) return;
pST->_EllapsedTime += DT64; pST->_EllapsedTime += times.frameDiffMs;
// pST->setH(std::min((sint32) pST->getMaxHeight(), (sint32) (pST->_StartHeight + pST->_EllapsedTime / 9))); // pST->setH(std::min((sint32) pST->getMaxHeight(), (sint32) (pST->_StartHeight + pST->_EllapsedTime / 9)));
pST->setH((sint32) (pST->_StartHeight + pST->_EllapsedTime / 9)); pST->setH((sint32) (pST->_StartHeight + pST->_EllapsedTime / 9));
pST->invalidateCoords(); pST->invalidateCoords();
@ -224,13 +219,15 @@ class CSTDown : public IActionHandler
public: public:
virtual void execute (CCtrlBase *pCaller, const std::string &/* Params */) virtual void execute (CCtrlBase *pCaller, const std::string &/* Params */)
{ {
const CWidgetManager::SInterfaceTimes &times = CWidgetManager::getInstance()->getInterfaceTimes();
CGroupScrollText *pST = dynamic_cast<CGroupScrollText*>(pCaller->getParent()); CGroupScrollText *pST = dynamic_cast<CGroupScrollText*>(pCaller->getParent());
if (pST == NULL) return; if (pST == NULL) return;
if (pST->getList() == NULL) return; if (pST->getList() == NULL) return;
// get the font height from the text template of the list // get the font height from the text template of the list
const CViewText *vt = pST->getList()->getTextTemplatePtr(); const CViewText *vt = pST->getList()->getTextTemplatePtr();
if (!vt) return; if (!vt) return;
pST->_EllapsedTime += DT64; pST->_EllapsedTime += times.frameDiffMs;
// pST->setH(std::max((sint32) pST->getMinHeight(), (sint32) (pST->_StartHeight - pST->_EllapsedTime / 9))); // pST->setH(std::max((sint32) pST->getMinHeight(), (sint32) (pST->_StartHeight - pST->_EllapsedTime / 9)));
pST->setH((sint32) (pST->_StartHeight - pST->_EllapsedTime / 9)); pST->setH((sint32) (pST->_StartHeight - pST->_EllapsedTime / 9));
pST->invalidateCoords(); pST->invalidateCoords();