aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Workspace.cc44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 676c907..8862263 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -310,13 +310,13 @@ void Workspace::setName(char *new_name) {
310 } else { 310 } else {
311 name = new char[128]; 311 name = new char[128];
312 sprintf(name, I18n::instance()-> 312 sprintf(name, I18n::instance()->
313 getMessage( 313 getMessage(
314#ifdef NLS 314#ifdef NLS
315 WorkspaceSet, WorkspaceDefaultNameFormat, 315 WorkspaceSet, WorkspaceDefaultNameFormat,
316#else // !NLS 316#else // !NLS
317 0, 0, 317 0, 0,
318#endif // NLS 318#endif // NLS
319 "Workspace %d"), id + 1); 319 "Workspace %d"), id + 1);
320 } 320 }
321 321
322 screen->updateWorkspaceNamesAtom(); 322 screen->updateWorkspaceNamesAtom();
@@ -459,30 +459,30 @@ void Workspace::placeWindow(FluxboxWindow *win) {
459 } 459 }
460 460
461 if ((toolbar_x < test_x + win_w && 461 if ((toolbar_x < test_x + win_w &&
462 toolbar_x + toolbar_w > test_x && 462 toolbar_x + toolbar_w > test_x &&
463 toolbar_y < test_y + win_h && 463 toolbar_y < test_y + win_h &&
464 toolbar_y + toolbar_h > test_y) 464 toolbar_y + toolbar_h > test_y)
465#ifdef SLIT 465#ifdef SLIT
466 || 466 ||
467 (slit_x < test_x + win_w && 467 (slit_x < test_x + win_w &&
468 slit_x + slit_w > test_x && 468 slit_x + slit_w > test_x &&
469 slit_y < test_y + win_h && 469 slit_y < test_y + win_h &&
470 slit_y + slit_h > test_y) 470 slit_y + slit_h > test_y)
471#endif // SLIT 471#endif // SLIT
472 ) 472 )
473 placed = False; 473 placed = False;
474 474
475 if (placed) { 475 if (placed) {
476 place_x = test_x; 476 place_x = test_x;
477 place_y = test_y; 477 place_y = test_y;
478 478
479 break; 479 break;
480 } 480 }
481 481
482 test_y += change_y; 482 test_y += change_y;
483 } 483 }
484 484
485 test_x += change_x; 485 test_x += change_x;
486 } 486 }
487 487
488 break; } 488 break; }
@@ -490,7 +490,7 @@ void Workspace::placeWindow(FluxboxWindow *win) {
490 490
491 if (! placed) { 491 if (! placed) {
492 if (((unsigned) cascade_x > (screen->getWidth() / 2)) || 492 if (((unsigned) cascade_x > (screen->getWidth() / 2)) ||
493 ((unsigned) cascade_y > (screen->getHeight() / 2))) 493 ((unsigned) cascade_y > (screen->getHeight() / 2)))
494 cascade_x = cascade_y = 32; 494 cascade_x = cascade_y = 32;
495 495
496 place_x = cascade_x; 496 place_x = cascade_x;