PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: fix IsInRegion

Browse Source 
(0,0) was inside the region of "locationless" action objects,
leading to all kinds of strange behavior when clicking in the
upper left corner.

Change-Id: I222db4ff499f3c30605b05267f005accb2e0dc99
This commit is contained in:
that
2015-01-29 21:00:41 +01:00
committed by Dees Troy
parent ecd8918634
commit f8194e2924
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/console.cpp
+2 -2
View File
@@ -339,7 +339,7 @@ int GUIConsole::SetRenderPos(int x, int y, int w, int h)
}
// IsInRegion - Checks if the request is handled by this object
// Return 0 if this object handles the request, 1 if not
// Return 1 if this object handles the request, 0 if not
int GUIConsole::IsInRegion(int x, int y)
{
if (mSlideout)
@@ -353,7 +353,7 @@ int GUIConsole::IsInRegion(int x, int y)
return 0;
}
return (x < mConsoleX || x > mConsoleX + mConsoleW || y < mConsoleY || y > mConsoleY + mConsoleH) ? 0 : 1;
return (x < mConsoleX || x >= mConsoleX + mConsoleW || y < mConsoleY || y >= mConsoleY + mConsoleH) ? 0 : 1;
}
// NotifyTouch - Notify of a touch event
gui/objects.hpp
+3 -3
View File
@@ -111,8 +111,8 @@ public:
virtual int SetActionPos(int x, int y, int w = 0, int h = 0);
// IsInRegion - Checks if the request is handled by this object
// Return 0 if this object handles the request, 1 if not
virtual int IsInRegion(int x, int y) { return ((x < mActionX || x > mActionX + mActionW || y < mActionY || y > mActionY + mActionH) ? 0 : 1); }
// Return 1 if this object handles the request, 0 if not
virtual int IsInRegion(int x, int y) { return ((x < mActionX || x >= mActionX + mActionW || y < mActionY || y >= mActionY + mActionH) ? 0 : 1); }
protected:
int mActionX, mActionY, mActionW, mActionH;
@@ -403,7 +403,7 @@ public:
virtual int SetRenderPos(int x, int y, int w = 0, int h = 0);
// IsInRegion - Checks if the request is handled by this object
// Return 0 if this object handles the request, 1 if not
// Return 1 if this object handles the request, 0 if not
virtual int IsInRegion(int x, int y);
// NotifyTouch - Notify of a touch event