Skip to content

fix clicking outside camera joystick_rotate triggered rotation with non-square shape #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chanayane merged 1 commit into from
Apr 8, 2026
+26 −10
Merged

fix clicking outside camera joystick_rotate triggered rotation with non-square shape #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions indra/newview/lljoystickbutton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,32 @@ void LLJoystick::updateSlop()

bool LLJoystick::pointInCircle(S32 x, S32 y) const
{
if(this->getLocalRect().getHeight() != this->getLocalRect().getWidth())
{
LL_DEBUGS() << "Joystick shape is not square"<<LL_ENDL;
return true;
}
//center is x and y coordinates of center of joystick circle, and also its radius
int center = this->getLocalRect().getHeight()/2;
bool in_circle = (x - center) * (x - center) + (y - center) * (y - center) <= center * center;

return in_circle;
// <FS:Chanayane> Fix joystick accepting clicks outside its circular shape when non-square
// Original code assumed a square widget; if not square it accepted all clicks as a fallback,
// causing camera rotation to trigger anywhere in the bounding rect.
// Replaced with an ellipse test so non-square widgets are handled correctly.
//if(this->getLocalRect().getHeight() != this->getLocalRect().getWidth())
//{
// LL_DEBUGS() << "Joystick shape is not square"<<LL_ENDL;
// return true;
//}
////center is x and y coordinates of center of joystick circle, and also its radius
//int center = this->getLocalRect().getHeight()/2;
//bool in_circle = (x - center) * (x - center) + (y - center) * (y - center) <= center * center;
//return in_circle;

// Point-in-ellipse test: (dx/a)^2 + (dy/b)^2 <= 1
// where a and b are the horizontal and vertical semi-axes (half width/height).
F32 a = this->getLocalRect().getWidth() / 2.f;
F32 b = this->getLocalRect().getHeight() / 2.f;
if (a == 0.f || b == 0.f)
{
return false;
}
F32 dx = x - a;
F32 dy = y - b;
return (dx * dx) / (a * a) + (dy * dy) / (b * b) <= 1.f;
// </FS:Chanayane>
}

// <FS:Beq> FIRE-30414 Camera control arrows not clickable
Expand Down