Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8194e29 authored by that's avatar that Committed by Dees Troy
Browse files

gui: fix IsInRegion 

(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
parent ecd89186

gui/console.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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