summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthat <github@that.at>2015-01-29 01:05:01 +0100
committerDees Troy <dees_troy@teamw.in>2015-01-29 21:00:41 +0100
commitf8194e2924acb6dd2c220710f1ccefdfb75053c6 (patch)
tree1242a17d5c9c1dc26029297c7833e95434552791
parentUse macro to add actions to the action map (diff)
downloadandroid_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar.gz
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar.bz2
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar.lz
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar.xz
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.tar.zst
android_bootable_recovery-f8194e2924acb6dd2c220710f1ccefdfb75053c6.zip
Diffstat (limited to '')
-rw-r--r--gui/console.cpp4
-rw-r--r--gui/objects.hpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/console.cpp b/gui/console.cpp
index aad392ca3..218a30568 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -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
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 832569c1d..bdccc6e42 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -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