mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Rect::inflate() -> enlarge() and Rect::deflate -> shrink().

Browse Source
This commit is contained in:
David Capello 2011-01-30 20:03:10 -03:00
parent 2baa342a65
commit 7273b95b68
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gfx/rect.cpp
View File

@ -155,7 +155,7 @@ Rect& Rect::inflate(const Size& delta)
return *this; return *this;
} }
Rect& Rect::inflate(const Border& br) Rect& Rect::enlarge(const Border& br)
{ {
x -= br.left(); x -= br.left();
y -= br.top(); y -= br.top();
@ -164,15 +164,6 @@ Rect& Rect::inflate(const Border& br)
return *this; return *this;
} }
Rect& Rect::deflate(const Border& br)
{
x += br.left();
y += br.top();
w -= br.left() + br.right();
h -= br.top() + br.bottom();
return *this;
}
Rect& Rect::enlarge(int unit) Rect& Rect::enlarge(int unit)
{ {
x -= unit; x -= unit;
@ -182,6 +173,15 @@ Rect& Rect::enlarge(int unit)
return *this; return *this;
} }
Rect& Rect::shrink(const Border& br)
{
x += br.left();
y += br.top();
w -= br.left() + br.right();
h -= br.top() + br.bottom();
return *this;
}
Rect& Rect::shrink(int unit) Rect& Rect::shrink(int unit)
{ {
x += unit; x += unit;
@ -244,24 +244,24 @@ Rect Rect::createIntersect(const Rect& rc) const
const Rect& Rect::operator+=(const Border& br) const Rect& Rect::operator+=(const Border& br)
{ {
inflate(br); enlarge(br);
return *this; return *this;
} }
const Rect& Rect::operator-=(const Border& br) const Rect& Rect::operator-=(const Border& br)
{ {
deflate(br); shrink(br);
return *this; return *this;
} }
Rect Rect::operator+(const Border& br) const Rect Rect::operator+(const Border& br) const
{ {
return Rect(*this).inflate(br); return Rect(*this).enlarge(br);
} }
Rect Rect::operator-(const Border& br) const Rect Rect::operator-(const Border& br) const
{ {
return Rect(*this).deflate(br); return Rect(*this).shrink(br);
} }
bool Rect::operator==(const Rect& rc) const bool Rect::operator==(const Rect& rc) const

4
src/gfx/rect.h
View File

@ -78,11 +78,11 @@ public:
Rect& offset(const Point& delta); Rect& offset(const Point& delta);
Rect& inflate(int dw, int dh); Rect& inflate(int dw, int dh);
Rect& inflate(const Size& delta); Rect& inflate(const Size& delta);
Rect& inflate(const Border& br);
Rect& deflate(const Border& br);
Rect& enlarge(int unit); Rect& enlarge(int unit);
Rect& enlarge(const Border& br);
Rect& shrink(int unit); Rect& shrink(int unit);
Rect& shrink(const Border& br);
// Returns true if this rectangle encloses the pt point. // Returns true if this rectangle encloses the pt point.
bool contains(const Point& pt) const; bool contains(const Point& pt) const;