make methods for Rect that use Point

1 files changed, 55 insertions, 12 deletions

diff --git a/otk/rect.cc b/otk/rect.cc
index db53b37e..f5068efe 100644
--- a/otk/rect.cc
+++ b/otk/rect.cc
@@ -2,7 +2,8 @@
 
 namespace otk {
 
-void Rect::setX(int x) {
+void Rect::setX(int x)
+{
   _x2 += x - _x1;
   _x1 = x;
 }
@@ -15,7 +16,17 @@ void Rect::setY(int y)
 }
 
 
-void Rect::setPos(int x, int y) {
+void Rect::setPos(const Point &location)
+{
+  _x2 += location.x() - _x1;
+  _x1 = location.x();
+  _y2 += location.y() - _y1;
+  _y1 = loaction.y();
+}
+
+
+void Rect::setPos(int x, int y)
+{
   _x2 += x - _x1;
   _x1 = x;
   _y2 += y - _y1;
@@ -23,28 +34,46 @@ void Rect::setPos(int x, int y) {
 }
 
 
-void Rect::setWidth(unsigned int w) {
+void Rect::setWidth(unsigned int w)
+{
   _x2 = w + _x1 - 1;
 }
 
 
-void Rect::setHeight(unsigned int h) {
+void Rect::setHeight(unsigned int h)
+{
   _y2 = h + _y1 - 1;
 }
 
 
-void Rect::setSize(unsigned int w, unsigned int h) {
+void Rect::setSize(unsigned int w, unsigned int h)
+{
   _x2 = w + _x1 - 1;
   _y2 = h + _y1 - 1;
 }
 
 
-void Rect::setRect(int x, int y, unsigned int w, unsigned int h) {
+void Rect::setSize(const Point &size)
+{
+  _x2 = size.x() + _x1 - 1;
+  _y2 = size.y() + _y1 - 1;
+}
+
+
+void Rect::setRect(int x, int y, unsigned int w, unsigned int h)
+{
   *this = Rect(x, y, w, h);
 }
 
 
-void Rect::setCoords(int l, int t, int r, int b) {
+void setRect(const Point &location, const Point &size)
+{
+  *this = Rect(location, size);
+}
+
+
+void Rect::setCoords(int l, int t, int r, int b)
+{
   _x1 = l;
   _y1 = t;
   _x2 = r;
@@ -52,7 +81,17 @@ void Rect::setCoords(int l, int t, int r, int b) {
 }
 
 
-Rect Rect::operator|(const Rect &a) const {
+void setCoords(const Point &tl, const Point &br)
+{
+  _x1 = tl.x();
+  _y1 = tl.y();
+  _x2 = br.x();
+  _y2 = br.y();
+}
+
+
+Rect Rect::operator|(const Rect &a) const
+{
   Rect b;
 
   b._x1 = std::min(_x1, a._x1);
@@ -64,7 +103,8 @@ Rect Rect::operator|(const Rect &a) const {
 }
 
 
-Rect Rect::operator&(const Rect &a) const {
+Rect Rect::operator&(const Rect &a) const
+{
   Rect b;
 
   b._x1 = std::max(_x1, a._x1);
@@ -76,19 +116,22 @@ Rect Rect::operator&(const Rect &a) const {
 }
 
 
-bool Rect::intersects(const Rect &a) const {
+bool Rect::intersects(const Rect &a) const
+{
   return std::max(_x1, a._x1) <= std::min(_x2, a._x2) &&
          std::max(_y1, a._y1) <= std::min(_y2, a._y2);
 }
 
 
-bool Rect::contains(int x, int y) const {
+bool Rect::contains(int x, int y) const
+{
   return x >= _x1 && x <= _x2 &&
          y >= _y1 && y <= _y2;
 }
 
 
-bool Rect::contains(const Rect& a) const {
+bool Rect::contains(const Rect& a) const
+{
   return a._x1 >= _x1 && a._x2 <= _x2 &&
          a._y1 >= _y1 && a._y2 <= _y2;
 }