diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc index 98199c7..b44fd1d 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -3717,25 +3717,27 @@ FluxboxWindow::ReferenceCorner FluxboxWindow::getCorner(string str) { | |||
3717 | void FluxboxWindow::translateXCoords(int &x, ReferenceCorner dir) const { | 3717 | void FluxboxWindow::translateXCoords(int &x, ReferenceCorner dir) const { |
3718 | int head = getOnHead(), bw = 2 * frame().window().borderWidth(), | 3718 | int head = getOnHead(), bw = 2 * frame().window().borderWidth(), |
3719 | left = screen().maxLeft(head), right = screen().maxRight(head); | 3719 | left = screen().maxLeft(head), right = screen().maxRight(head); |
3720 | int w = width(); | ||
3720 | 3721 | ||
3721 | if (dir == LEFTTOP || dir == LEFT || dir == LEFTBOTTOM) | 3722 | if (dir == LEFTTOP || dir == LEFT || dir == LEFTBOTTOM) |
3722 | x += left; | 3723 | x += left; |
3723 | if (dir == RIGHTTOP || dir == RIGHT || dir == RIGHTBOTTOM) | 3724 | if (dir == RIGHTTOP || dir == RIGHT || dir == RIGHTBOTTOM) |
3724 | x = right - width() - bw - x; | 3725 | x = right - w - bw - x; |
3725 | if (dir == TOP || dir == CENTER || dir == BOTTOM) | 3726 | if (dir == TOP || dir == CENTER || dir == BOTTOM) |
3726 | x += (left + right - width() - bw)/2; | 3727 | x += (left + right - w - bw)/2; |
3727 | } | 3728 | } |
3728 | 3729 | ||
3729 | void FluxboxWindow::translateYCoords(int &y, ReferenceCorner dir) const { | 3730 | void FluxboxWindow::translateYCoords(int &y, ReferenceCorner dir) const { |
3730 | int head = getOnHead(), bw = 2 * frame().window().borderWidth(), | 3731 | int head = getOnHead(), bw = 2 * frame().window().borderWidth(), |
3731 | top = screen().maxTop(head), bottom = screen().maxBottom(head); | 3732 | top = screen().maxTop(head), bottom = screen().maxBottom(head); |
3733 | int h = height(); | ||
3732 | 3734 | ||
3733 | if (dir == LEFTTOP || dir == TOP || dir == RIGHTTOP) | 3735 | if (dir == LEFTTOP || dir == TOP || dir == RIGHTTOP) |
3734 | y += top; | 3736 | y += top; |
3735 | if (dir == LEFTBOTTOM || dir == BOTTOM || dir == RIGHTBOTTOM) | 3737 | if (dir == LEFTBOTTOM || dir == BOTTOM || dir == RIGHTBOTTOM) |
3736 | y = bottom - height() - bw - y; | 3738 | y = bottom - h - bw - y; |
3737 | if (dir == LEFT || dir == CENTER || dir == RIGHT) | 3739 | if (dir == LEFT || dir == CENTER || dir == RIGHT) |
3738 | y += (top + bottom - height() - bw)/2; | 3740 | y += (top + bottom - h - bw)/2; |
3739 | } | 3741 | } |
3740 | 3742 | ||
3741 | void FluxboxWindow::translateCoords(int &x, int &y, ReferenceCorner dir) const { | 3743 | void FluxboxWindow::translateCoords(int &x, int &y, ReferenceCorner dir) const { |