aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-11 13:36:12 (GMT)
committerfluxgen <fluxgen>2003-05-11 13:36:12 (GMT)
commitaa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da (patch)
tree9e8f1c81637c6e000127ed32f794e166eb4ac6a3 /src/Workspace.cc
parent816190411a9e5bd6cdfaa9d579f84be348a2f1bc (diff)
downloadfluxbox_pavel-aa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da.zip
fluxbox_pavel-aa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da.tar.bz2
minor cleaning
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r--src/Workspace.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index e0d23b6..93ba77e 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.60 2003/05/10 23:07:04 fluxgen Exp $ 25// $Id: Workspace.cc,v 1.61 2003/05/11 13:36:12 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -81,7 +81,7 @@ public:
81 if (m_client.fbwindow() == 0) 81 if (m_client.fbwindow() == 0)
82 return; 82 return;
83 FluxboxWindow &win = *m_client.fbwindow(); 83 FluxboxWindow &win = *m_client.fbwindow();
84 BScreen &scr = win.getScreen(); 84 BScreen &scr = win.screen();
85 // determine workspace change 85 // determine workspace change
86 for (size_t i=0; i<scr.getCount(); i++) { 86 for (size_t i=0; i<scr.getCount(); i++) {
87 if (scr.getWorkspace(i) == &m_space) { 87 if (scr.getWorkspace(i) == &m_space) {
@@ -499,8 +499,8 @@ void Workspace::placeWindow(FluxboxWindow &win) {
499 if (screen.getRowPlacementDirection() == BScreen::RIGHTLEFT) 499 if (screen.getRowPlacementDirection() == BScreen::RIGHTLEFT)
500 change_x = -1; 500 change_x = -1;
501 501
502 int win_w = win.getWidth() + win.getFbWindow().borderWidth()*2, 502 int win_w = win.width() + win.getFbWindow().borderWidth()*2,
503 win_h = win.getHeight() + win.getFbWindow().borderWidth()*2; 503 win_h = win.height() + win.getFbWindow().borderWidth()*2;
504 504
505 505
506 int test_x, test_y, curr_x, curr_y, curr_w, curr_h; 506 int test_x, test_y, curr_x, curr_y, curr_w, curr_h;
@@ -579,9 +579,9 @@ void Workspace::placeWindow(FluxboxWindow &win) {
579 579
580 curr_x = window.getXFrame(); 580 curr_x = window.getXFrame();
581 curr_y = window.getYFrame(); 581 curr_y = window.getYFrame();
582 curr_w = window.getWidth() + window.getFbWindow().borderWidth()*2; 582 curr_w = window.width() + window.getFbWindow().borderWidth()*2;
583 curr_h = window.isShaded() ? window.getTitleHeight() : 583 curr_h = window.isShaded() ? window.getTitleHeight() :
584 window.getHeight() + window.getFbWindow().borderWidth()*2; 584 window.height() + window.getFbWindow().borderWidth()*2;
585 585
586 if (curr_x < test_x + win_w && 586 if (curr_x < test_x + win_w &&
587 curr_x + curr_w > test_x && 587 curr_x + curr_w > test_x &&
@@ -634,11 +634,11 @@ void Workspace::placeWindow(FluxboxWindow &win) {
634 for (; it != it_end && placed; ++it) { 634 for (; it != it_end && placed; ++it) {
635 curr_x = (*it)->getXFrame(); 635 curr_x = (*it)->getXFrame();
636 curr_y = (*it)->getYFrame(); 636 curr_y = (*it)->getYFrame();
637 curr_w = (*it)->getWidth() + (*it)->getFbWindow().borderWidth()*2; 637 curr_w = (*it)->width() + (*it)->getFbWindow().borderWidth()*2;
638 curr_h = 638 curr_h =
639 (((*it)->isShaded()) 639 (((*it)->isShaded())
640 ? (*it)->getTitleHeight() 640 ? (*it)->getTitleHeight()
641 : (*it)->getHeight()) + 641 : (*it)->height()) +
642 (*it)->getFbWindow().borderWidth()*2; 642 (*it)->getFbWindow().borderWidth()*2;
643 643
644 644
@@ -687,5 +687,5 @@ void Workspace::placeWindow(FluxboxWindow &win) {
687 place_y = (((signed) screen.getHeight()) - win_h) / 2; 687 place_y = (((signed) screen.getHeight()) - win_h) / 2;
688 688
689 689
690 win.moveResize(place_x, place_y, win.getWidth(), win.getHeight()); 690 win.moveResize(place_x, place_y, win.width(), win.height());
691} 691}