aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r--src/Workspace.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index ec61e39..676c907 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -355,27 +355,27 @@ void Workspace::placeWindow(FluxboxWindow *win) {
355 (screen->getBorderWidth2x() * 2), 355 (screen->getBorderWidth2x() * 2),
356 place_x = 0, place_y = 0, change_x = 1, change_y = 1; 356 place_x = 0, place_y = 0, change_x = 1, change_y = 1;
357 357
358 if (screen->getColPlacementDirection() == BScreen::BottomTop) 358 if (screen->getColPlacementDirection() == BScreen::BOTTOMTOP)
359 change_y = -1; 359 change_y = -1;
360 if (screen->getRowPlacementDirection() == BScreen::RightLeft) 360 if (screen->getRowPlacementDirection() == BScreen::RIGHTLEFT)
361 change_x = -1; 361 change_x = -1;
362 362
363 register int test_x, test_y, curr_w, curr_h; 363 register int test_x, test_y, curr_w, curr_h;
364 364
365 switch (screen->getPlacementPolicy()) { 365 switch (screen->getPlacementPolicy()) {
366 case BScreen::RowSmartPlacement: { 366 case BScreen::ROWSMARTPLACEMENT: {
367 test_y = screen->getBorderWidth() + screen->getEdgeSnapThreshold(); 367 test_y = screen->getBorderWidth() + screen->getEdgeSnapThreshold();
368 if (screen->getColPlacementDirection() == BScreen::BottomTop) 368 if (screen->getColPlacementDirection() == BScreen::BOTTOMTOP)
369 test_y = screen->getHeight() - win_h - test_y; 369 test_y = screen->getHeight() - win_h - test_y;
370 370
371 while (((screen->getColPlacementDirection() == BScreen::BottomTop) ? 371 while (((screen->getColPlacementDirection() == BScreen::BOTTOMTOP) ?
372 test_y > 0 : test_y + win_h < (signed) screen->getHeight()) && 372 test_y > 0 : test_y + win_h < (signed) screen->getHeight()) &&
373 ! placed) { 373 ! placed) {
374 test_x = screen->getBorderWidth() + screen->getEdgeSnapThreshold(); 374 test_x = screen->getBorderWidth() + screen->getEdgeSnapThreshold();
375 if (screen->getRowPlacementDirection() == BScreen::RightLeft) 375 if (screen->getRowPlacementDirection() == BScreen::RIGHTLEFT)
376 test_x = screen->getWidth() - win_w - test_x; 376 test_x = screen->getWidth() - win_w - test_x;
377 377
378 while (((screen->getRowPlacementDirection() == BScreen::RightLeft) ? 378 while (((screen->getRowPlacementDirection() == BScreen::RIGHTLEFT) ?
379 test_x > 0 : test_x + win_w < (signed) screen->getWidth()) && 379 test_x > 0 : test_x + win_w < (signed) screen->getWidth()) &&
380 ! placed) { 380 ! placed) {
381 placed = True; 381 placed = True;
@@ -425,19 +425,19 @@ void Workspace::placeWindow(FluxboxWindow *win) {
425 425
426 break; } 426 break; }
427 427
428 case BScreen::ColSmartPlacement: { 428 case BScreen::COLSMARTPLACEMENT: {
429 test_x = screen->getBorderWidth() + screen->getEdgeSnapThreshold(); 429 test_x = screen->getBorderWidth() + screen->getEdgeSnapThreshold();
430 if (screen->getRowPlacementDirection() == BScreen::RightLeft) 430 if (screen->getRowPlacementDirection() == BScreen::RIGHTLEFT)
431 test_x = screen->getWidth() - win_w - test_x; 431 test_x = screen->getWidth() - win_w - test_x;
432 432
433 while (((screen->getRowPlacementDirection() == BScreen::RightLeft) ? 433 while (((screen->getRowPlacementDirection() == BScreen::RIGHTLEFT) ?
434 test_x > 0 : test_x + win_w < (signed) screen->getWidth()) && 434 test_x > 0 : test_x + win_w < (signed) screen->getWidth()) &&
435 ! placed) { 435 ! placed) {
436 test_y = screen->getBorderWidth() + screen->getEdgeSnapThreshold(); 436 test_y = screen->getBorderWidth() + screen->getEdgeSnapThreshold();
437 if (screen->getColPlacementDirection() == BScreen::BottomTop) 437 if (screen->getColPlacementDirection() == BScreen::BOTTOMTOP)
438 test_y = screen->getHeight() - win_h - test_y; 438 test_y = screen->getHeight() - win_h - test_y;
439 439
440 while (((screen->getColPlacementDirection() == BScreen::BottomTop) ? 440 while (((screen->getColPlacementDirection() == BScreen::BOTTOMTOP) ?
441 test_y > 0 : test_y + win_h < (signed) screen->getHeight()) && 441 test_y > 0 : test_y + win_h < (signed) screen->getHeight()) &&
442 ! placed) { 442 ! placed) {
443 placed = True; 443 placed = True;