ios stuff

This commit is contained in:
vladislav.khorev committed 2013-08-08 21:09:35 +00:00
1 parent 554d35f27b
commit 144acdd633
5 files changed
+48

No files matched your search

+5
View File
@@ -330,6 +330,11 @@ void TUniversalButton::OnTapUp(vec2 pos)
}
}
void TUniversalButton::OnTapUpAfterMove(vec2 pos)
{
OnTapUp(pos);
}
void TUniversalButton::OnMoveOut()
{
+38
View File
@@ -325,6 +325,44 @@ void TGUIManager::OnMouseUp(vec2 pos)
}
}
void TGUIManager::OnMouseUpAfterMove(vec2 pos)
{
//Xperimental - need to call widget methods and signals NOT IN "FOR" LOOP
boost::lock_guard<boost::mutex> guard(WidgetListMutex);
TWidgetArr::reverse_iterator i;
std::vector<std::shared_ptr<boost::signal<void (TSignalParam)>>> signalMap;
for (i = WidgetArr.rbegin(); i != WidgetArr.rend(); ++i)
{
if (i->Widget->CheckClick(pos))
{
bool isTransparentForInput = i->Widget->IsTransparentForInput();
i->Widget->OnTapUpAfterMove(pos);
i->IsMouseDown = false;
//signalMap.push_back((i->SignalMap[CONST_CLICK_SIGNAL_NAME]));
//Do not call signals here
if (! isTransparentForInput)
{
break;
}
}
}
//Keep this outside since signal may affect WidgetArr
BOOST_FOREACH(auto signalPtr, signalMap)
{
(*signalPtr)(TSignalParam(pos));
}
}
void TGUIManager::OnMove(vec2 shift)
{