aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 11:17:29 (GMT)
committerfluxgen <fluxgen>2003-05-15 11:17:29 (GMT)
commitcbce8634dde14fd7000fde92e86f4bd4bf3525c2 (patch)
treeb3be6c129906ecb67114616d761184cf3375c891 /src/Workspace.cc
parent93220b5f1abee3057b292abb958a437ebbc707b4 (diff)
downloadfluxbox_pavel-cbce8634dde14fd7000fde92e86f4bd4bf3525c2.zip
fluxbox_pavel-cbce8634dde14fd7000fde92e86f4bd4bf3525c2.tar.bz2
cleaning in FluxboxWindow interface
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r--src/Workspace.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index c5e6d73..0f89986 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Workspace.cc,v 1.63 2003/05/11 17:14:41 fluxgen Exp $ 25// $Id: Workspace.cc,v 1.64 2003/05/15 11:17:27 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -203,7 +203,7 @@ int Workspace::addWindow(FluxboxWindow &w, bool place) {
203 screen().updateNetizenWindowAdd((*client_it)->window(), m_id); 203 screen().updateNetizenWindowAdd((*client_it)->window(), m_id);
204 } 204 }
205 205
206 return w.getWindowNumber(); 206 return w.windowNumber();
207} 207}
208 208
209 209
@@ -485,8 +485,8 @@ void Workspace::placeWindow(FluxboxWindow &win) {
485 if (screen().getRowPlacementDirection() == BScreen::RIGHTLEFT) 485 if (screen().getRowPlacementDirection() == BScreen::RIGHTLEFT)
486 change_x = -1; 486 change_x = -1;
487 487
488 int win_w = win.width() + win.getFbWindow().borderWidth()*2, 488 int win_w = win.width() + win.fbWindow().borderWidth()*2,
489 win_h = win.height() + win.getFbWindow().borderWidth()*2; 489 win_h = win.height() + win.fbWindow().borderWidth()*2;
490 490
491 491
492 int test_x, test_y, curr_x, curr_y, curr_w, curr_h; 492 int test_x, test_y, curr_x, curr_y, curr_w, curr_h;
@@ -563,11 +563,11 @@ void Workspace::placeWindow(FluxboxWindow &win) {
563 for (; win_it != win_it_end && placed; ++win_it) { 563 for (; win_it != win_it_end && placed; ++win_it) {
564 FluxboxWindow &window = **win_it; 564 FluxboxWindow &window = **win_it;
565 565
566 curr_x = window.getXFrame(); 566 curr_x = window.x();
567 curr_y = window.getYFrame(); 567 curr_y = window.y();
568 curr_w = window.width() + window.getFbWindow().borderWidth()*2; 568 curr_w = window.width() + window.fbWindow().borderWidth()*2;
569 curr_h = window.isShaded() ? window.getTitleHeight() : 569 curr_h = window.isShaded() ? window.titleHeight() :
570 window.height() + window.getFbWindow().borderWidth()*2; 570 window.height() + window.fbWindow().borderWidth()*2;
571 571
572 if (curr_x < test_x + win_w && 572 if (curr_x < test_x + win_w &&
573 curr_x + curr_w > test_x && 573 curr_x + curr_w > test_x &&
@@ -618,14 +618,14 @@ void Workspace::placeWindow(FluxboxWindow &win) {
618 Windows::iterator it = m_windowlist.begin(); 618 Windows::iterator it = m_windowlist.begin();
619 Windows::iterator it_end = m_windowlist.end(); 619 Windows::iterator it_end = m_windowlist.end();
620 for (; it != it_end && placed; ++it) { 620 for (; it != it_end && placed; ++it) {
621 curr_x = (*it)->getXFrame(); 621 curr_x = (*it)->x();
622 curr_y = (*it)->getYFrame(); 622 curr_y = (*it)->y();
623 curr_w = (*it)->width() + (*it)->getFbWindow().borderWidth()*2; 623 curr_w = (*it)->width() + (*it)->fbWindow().borderWidth()*2;
624 curr_h = 624 curr_h =
625 (((*it)->isShaded()) 625 (((*it)->isShaded())
626 ? (*it)->getTitleHeight() 626 ? (*it)->titleHeight()
627 : (*it)->height()) + 627 : (*it)->height()) +
628 (*it)->getFbWindow().borderWidth()*2; 628 (*it)->fbWindow().borderWidth()*2;
629 629
630 630
631 if (curr_x < test_x + win_w && 631 if (curr_x < test_x + win_w &&
@@ -663,8 +663,8 @@ void Workspace::placeWindow(FluxboxWindow &win) {
663 place_x = m_cascade_x; 663 place_x = m_cascade_x;
664 place_y = m_cascade_y; 664 place_y = m_cascade_y;
665 665
666 m_cascade_x += win.getTitleHeight(); 666 m_cascade_x += win.titleHeight();
667 m_cascade_y += win.getTitleHeight(); 667 m_cascade_y += win.titleHeight();
668 } 668 }
669 669
670 if (place_x + win_w > (signed) screen().getWidth()) 670 if (place_x + win_w > (signed) screen().getWidth())