diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Workspace.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index 9319f0c..6275062 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.31 2002/09/21 16:02:22 fluxgen Exp $ | 25 | // $Id: Workspace.cc,v 1.32 2002/10/13 21:52:00 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Workspace.hh" | 27 | #include "Workspace.hh" |
28 | 28 | ||
@@ -41,7 +41,7 @@ | |||
41 | #endif // _GNU_SOURCE | 41 | #endif // _GNU_SOURCE |
42 | 42 | ||
43 | #ifdef HAVE_CONFIG_H | 43 | #ifdef HAVE_CONFIG_H |
44 | #include "../config.h" | 44 | #include "config.h" |
45 | #endif // HAVE_CONFIG_H | 45 | #endif // HAVE_CONFIG_H |
46 | 46 | ||
47 | #include <X11/Xlib.h> | 47 | #include <X11/Xlib.h> |
@@ -463,7 +463,7 @@ void Workspace::shutdown() { | |||
463 | void Workspace::placeWindow(FluxboxWindow *win) { | 463 | void Workspace::placeWindow(FluxboxWindow *win) { |
464 | Bool placed = False; | 464 | Bool placed = False; |
465 | int borderWidth4x = screen->getBorderWidth2x() * 2, | 465 | int borderWidth4x = screen->getBorderWidth2x() * 2, |
466 | #ifdef SLIT | 466 | #ifdef SLIT |
467 | slit_x = screen->getSlit()->x() - screen->getBorderWidth(), | 467 | slit_x = screen->getSlit()->x() - screen->getBorderWidth(), |
468 | slit_y = screen->getSlit()->y() - screen->getBorderWidth(), | 468 | slit_y = screen->getSlit()->y() - screen->getBorderWidth(), |
469 | slit_w = screen->getSlit()->width() + borderWidth4x, | 469 | slit_w = screen->getSlit()->width() + borderWidth4x, |
@@ -611,7 +611,7 @@ void Workspace::placeWindow(FluxboxWindow *win) { | |||
611 | toolbar_x + toolbar_w > test_x && | 611 | toolbar_x + toolbar_w > test_x && |
612 | toolbar_y < test_y + win_h && | 612 | toolbar_y < test_y + win_h && |
613 | toolbar_y + toolbar_h > test_y) | 613 | toolbar_y + toolbar_h > test_y) |
614 | #ifdef SLIT | 614 | #ifdef SLIT |
615 | || | 615 | || |
616 | (slit_x < test_x + win_w && | 616 | (slit_x < test_x + win_w && |
617 | slit_x + slit_w > test_x && | 617 | slit_x + slit_w > test_x && |
@@ -733,7 +733,7 @@ void Workspace::placeWindow(FluxboxWindow *win) { | |||
733 | toolbar_x + toolbar_w > test_x && | 733 | toolbar_x + toolbar_w > test_x && |
734 | toolbar_y < test_y + win_h && | 734 | toolbar_y < test_y + win_h && |
735 | toolbar_y + toolbar_h > test_y) | 735 | toolbar_y + toolbar_h > test_y) |
736 | #ifdef SLIT | 736 | #ifdef SLIT |
737 | || | 737 | || |
738 | (slit_x < test_x + win_w && | 738 | (slit_x < test_x + win_w && |
739 | slit_x + slit_w > test_x && | 739 | slit_x + slit_w > test_x && |