diff options
-rw-r--r-- | src/ColSmartPlacement.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ColSmartPlacement.cc b/src/ColSmartPlacement.cc index 251d8f9..b0bcf68 100644 --- a/src/ColSmartPlacement.cc +++ b/src/ColSmartPlacement.cc | |||
@@ -95,16 +95,15 @@ bool ColSmartPlacement::placeWindow(const FluxboxWindow &win, int head, | |||
95 | 95 | ||
96 | next_y = test_y + change_y; | 96 | next_y = test_y + change_y; |
97 | 97 | ||
98 | std::list<FluxboxWindow *>::const_iterator it = | 98 | std::list<FluxboxWindow *>::const_iterator it = windowlist.begin(); |
99 | windowlist.begin(); | 99 | std::list<FluxboxWindow *>::const_iterator it_end = windowlist.end(); |
100 | std::list<FluxboxWindow *>::const_iterator it_end = | ||
101 | windowlist.end(); | ||
102 | for (; it != it_end && placed; ++it) { | 100 | for (; it != it_end && placed; ++it) { |
103 | if (*it == &win) continue; | 101 | if (*it == &win) continue; |
102 | int bw = 2 * (*it)->fbWindow().borderWidth(); | ||
104 | int curr_x = (*it)->x() - (*it)->xOffset(); | 103 | int curr_x = (*it)->x() - (*it)->xOffset(); |
105 | int curr_y = (*it)->y() - (*it)->yOffset(); | 104 | int curr_y = (*it)->y() - (*it)->yOffset(); |
106 | int curr_w = (*it)->width() + (*it)->fbWindow().borderWidth()*2 + (*it)->widthOffset(); | 105 | int curr_w = (*it)->width() + bw + (*it)->widthOffset(); |
107 | int curr_h = (*it)->height() + (*it)->fbWindow().borderWidth()*2 + (*it)->heightOffset(); | 106 | int curr_h = (*it)->height() + bw + (*it)->heightOffset(); |
108 | 107 | ||
109 | if (curr_x < test_x + win_w && | 108 | if (curr_x < test_x + win_w && |
110 | curr_x + curr_w > test_x && | 109 | curr_x + curr_w > test_x && |