diff options
author | simonb <simonb> | 2006-05-16 13:37:25 (GMT) |
---|---|---|
committer | simonb <simonb> | 2006-05-16 13:37:25 (GMT) |
commit | 8bcd03c172ad5a6efc04632fa1f36c9d02e58bc9 (patch) | |
tree | 8cae2d3c020c2e546175ae587698356f333ec26b /src | |
parent | a4b0582739971fabe4626110e6551396315e3996 (diff) | |
download | fluxbox-8bcd03c172ad5a6efc04632fa1f36c9d02e58bc9.zip fluxbox-8bcd03c172ad5a6efc04632fa1f36c9d02e58bc9.tar.bz2 |
issue with maximise and quadrant resize
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 8 | ||||
-rw-r--r-- | src/Window.hh | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/Window.cc b/src/Window.cc index cbcb1f7..b87a9a5 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -1655,6 +1655,9 @@ void FluxboxWindow::maximize(int type) { | |||
1655 | if (isShaded()) | 1655 | if (isShaded()) |
1656 | shade(); | 1656 | shade(); |
1657 | 1657 | ||
1658 | if (isResizing()) | ||
1659 | stopResizing(); | ||
1660 | |||
1658 | int head = screen().getHead(frame().window()); | 1661 | int head = screen().getHead(frame().window()); |
1659 | int new_x = frame().x(), | 1662 | int new_x = frame().x(), |
1660 | new_y = frame().y(), | 1663 | new_y = frame().y(), |
@@ -1730,7 +1733,12 @@ void FluxboxWindow::maximize(int type) { | |||
1730 | m_last_resize_y = new_y; | 1733 | m_last_resize_y = new_y; |
1731 | m_last_resize_w = new_w; | 1734 | m_last_resize_w = new_w; |
1732 | m_last_resize_h = new_h; | 1735 | m_last_resize_h = new_h; |
1736 | |||
1737 | ResizeCorner old_resize_corner = m_resize_corner; | ||
1738 | m_resize_corner = NOCORNER; | ||
1733 | fixsize(); | 1739 | fixsize(); |
1740 | m_resize_corner = old_resize_corner; | ||
1741 | |||
1734 | moveResize(m_last_resize_x, m_last_resize_y, m_last_resize_w, m_last_resize_h); | 1742 | moveResize(m_last_resize_x, m_last_resize_y, m_last_resize_w, m_last_resize_h); |
1735 | } | 1743 | } |
1736 | /** | 1744 | /** |
diff --git a/src/Window.hh b/src/Window.hh index 9c72ba3..db3e285 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -135,6 +135,7 @@ public: | |||
135 | }; | 135 | }; |
136 | 136 | ||
137 | enum ResizeCorner { | 137 | enum ResizeCorner { |
138 | NOCORNER, | ||
138 | LEFTTOP, | 139 | LEFTTOP, |
139 | LEFTBOTTOM, | 140 | LEFTBOTTOM, |
140 | RIGHTBOTTOM, | 141 | RIGHTBOTTOM, |