From 75c0a76a53bc31b162590fc767f5b2fe73ad07df Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 21 Apr 2002 18:52:28 +0000 Subject: changed external window interface to only have an area(), no size() and origin(), since all of their values are also in area() changed toolbar external inteface to have an area, no more getX/Y/Width/Height --- src/Toolbar.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/Toolbar.cc') diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 12f778eb..d238d1ea 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -154,14 +154,13 @@ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn), mapToolbar(); } -int Toolbar::getX() const { - return ((m_hidden) ? frame.x_hidden : frame.x); -} - -int Toolbar::getY() const { - if (screen.hideToolbar()) return screen.size().h(); - else if (m_hidden) return frame.y_hidden; - else return frame.y; +Rect Toolbar::area() const { + int x = ((m_hidden) ? frame.x_hidden : frame.x); + int y; + if (screen.hideToolbar()) y = screen.size().h(); + else if (m_hidden) y = frame.y_hidden; + else y = frame.y; + return Rect(x, y, frame.width, frame.height); } unsigned int Toolbar::getExposedHeight() const { -- cgit v1.2.3