jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Continue cleaning.

Browse source
This commit is contained in:
jmsgrogan 2023-01-13 14:29:12 +00:00
parent cd688f608f
commit cb4212d972
67 changed files with 367 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ui_elements/widgets/Widget.cpp
View file

@ -237,19 +237,19 @@ void Widget::updateChildLocations()
bool Widget::contains(const DiscretePoint& loc) const
{
if(loc.GetX() < mLocation.GetX())
if(loc.getX() < mLocation.getX())
{
return false;
}
if(loc.GetX() > mLocation.GetX() + mSize.mWidth)
if(loc.getX() > mLocation.getX() + mSize.mWidth)
{
return false;
}
if(loc.GetY() > mLocation.GetY() + mSize.mHeight)
if(loc.getY() > mLocation.getY() + mSize.mHeight)
{
return false;
}
if(loc.GetY() < mLocation.GetY())
if(loc.getY() < mLocation.getY())
{
return false;
}
@ -313,8 +313,8 @@ void Widget::onMyMouseEvent(const MouseEvent* event)
void Widget::updateBackground(const PaintEvent* event)
{
unsigned locX = mLocation.GetX() + mMargin.mLeft;
unsigned locY = mLocation.GetY() + mMargin.mTop;
unsigned locX = mLocation.getX() + mMargin.mLeft;
unsigned locY = mLocation.getX() + mMargin.mTop;
unsigned deltaX = mSize.mWidth - mMargin.mLeft - mMargin.mRight;
unsigned deltaY = mSize.mHeight - mMargin.mTop - mMargin.mBottom;