Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue 679. Filters now work with mouse and touch.

Browse Source
This commit is contained in:
Xawotihs
2011-07-09 10:51:49 +00:00
parent 8546f3dff8
commit 991bacbec5
1 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/WGui.cpp
+42 -7
View File
@@ -713,31 +713,66 @@ void WGuiSplit::setModal(bool val)
bool WGuiSplit::CheckUserInput(JButton key)
{
bool result = false;
if (hasFocus())
{
int i,j;
if (key == JGE_BTN_NONE && JGE::GetInstance()->GetLeftClickCoordinates(i, j))
{ // a dude clicked somwhere, we're gonna select the closest object from where he clicked
unsigned int distanceLeft, distanceRight;
distanceLeft = static_cast<unsigned int>((left->getY() - j) * (left->getY() - j) + (left->getX() - i) * (left->getX() - i));
distanceRight = static_cast<unsigned int>((right->getY() - j) * (right->getY() - j) + (right->getX() - i) * (right->getX() - i));
if (distanceLeft < distanceRight && bRight)
{
key = JGE_BTN_LEFT;
}
else if(!bRight && distanceLeft > distanceRight)
{
key = JGE_BTN_RIGHT;
}
}
if (!bRight)
{
if (left->CheckUserInput(key)) return true;
if (left->CheckUserInput(key)) {
result = true;
goto done;
}
if (key == JGE_BTN_RIGHT && !isModal() && right->Selectable() && left->Leaving(JGE_BTN_RIGHT))
{
bRight = !bRight;
right->Entering(JGE_BTN_RIGHT);
return true;
result = true;
goto done;
}
}
else
{
if (right->CheckUserInput(key)) return true;
if (right->CheckUserInput(key)) {
result = true;
goto done;
}
if (key == JGE_BTN_LEFT && !isModal() && left->Selectable() && right->Leaving(JGE_BTN_LEFT))
{
bRight = !bRight;
left->Entering(JGE_BTN_LEFT);
return true;
result = true;
goto done;
}
}
}
return false;
}
done:
if(result == true)
{
JGE::GetInstance()->LeftClickedProcessed();
}
return result;
}
void WGuiSplit::Update(float dt)
@@ -936,7 +971,7 @@ bool WGuiMenu::CheckUserInput(JButton key)
{
held = buttonNext;
duration = 0;
if (nextItem()) return true;
if (nextItem()) return true;
}
else if (held == buttonNext && duration > 1)
{