From 25cbe08cb6c46740b63f1259256433558bf38a5f Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 14 Apr 2002 19:30:38 +0000 Subject: Slit has an area Rect now, and returns Rect, Size, and Points instead of getX/Y and getWidth/Height. --- src/Slit.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/Slit.h') diff --git a/src/Slit.h b/src/Slit.h index cef5d6c6..b7dedb5a 100644 --- a/src/Slit.h +++ b/src/Slit.h @@ -28,6 +28,7 @@ #include "Basemenu.h" #include "LinkedList.h" +#include "Geometry.h" // forward declaration class Slit; @@ -107,10 +108,13 @@ private: Pixmap pixmap; Window window; - int x, y, x_hidden, y_hidden; - unsigned int width, height; + //int x, y, x_hidden, y_hidden; + //unsigned int width, height; + Rect area; + Point hidden; } frame; + friend class Slitmenu; friend class Slitmenu::Directionmenu; friend class Slitmenu::Placementmenu; @@ -128,13 +132,17 @@ public: inline const Window &getWindowID() const { return frame.window; } - inline const int &getX(void) const - { return ((hidden) ? frame.x_hidden : frame.x); } - inline const int &getY(void) const - { return ((hidden) ? frame.y_hidden : frame.y); } + //inline const int &getX(void) const + //{ return ((hidden) ? frame.x_hidden : frame.x); } + //inline const int &getY(void) const + //{ return ((hidden) ? frame.y_hidden : frame.y); } + inline const Point &origin() const { return frame.area.origin(); } + + //inline const unsigned int &getWidth(void) const { return frame.width; } + //inline const unsigned int &getHeight(void) const { return frame.height; } + inline const Size &size() const { return frame.area.size(); } - inline const unsigned int &getWidth(void) const { return frame.width; } - inline const unsigned int &getHeight(void) const { return frame.height; } + inline const Rect &area() const { return frame.area; } void addClient(Window); void removeClient(SlitClient *, Bool = True); -- cgit v1.2.3