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 380df19..3464112 100644 --- a/src/Window.cc +++ b/src/Window.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: Window.cc,v 1.199 2003/06/26 12:22:43 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.200 2003/06/30 15:02:39 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -305,6 +305,7 @@ FluxboxWindow::~FluxboxWindow() { | |||
305 | void FluxboxWindow::init() { | 305 | void FluxboxWindow::init() { |
306 | // so parent menu don't kill us | 306 | // so parent menu don't kill us |
307 | m_layermenu->setInternalMenu(); | 307 | m_layermenu->setInternalMenu(); |
308 | m_layermenu->disableTitle(); | ||
308 | 309 | ||
309 | m_attaching_tab = 0; | 310 | m_attaching_tab = 0; |
310 | 311 | ||
@@ -366,8 +367,6 @@ void FluxboxWindow::init() { | |||
366 | evm.add(*this, btn->window()); // we take care of button events for this | 367 | evm.add(*this, btn->window()); // we take care of button events for this |
367 | evm.add(*this, m_client->window()); | 368 | evm.add(*this, m_client->window()); |
368 | 369 | ||
369 | // frame().reconfigure(); | ||
370 | |||
371 | // redirect events from frame to us | 370 | // redirect events from frame to us |
372 | 371 | ||
373 | frame().setEventHandler(*this); | 372 | frame().setEventHandler(*this); |
@@ -1002,7 +1001,10 @@ void FluxboxWindow::moveResize(int new_x, int new_y, | |||
1002 | new_y = 0; | 1001 | new_y = 0; |
1003 | 1002 | ||
1004 | downsize(); | 1003 | downsize(); |
1005 | 1004 | if (!isResizable()) { | |
1005 | new_width = width(); | ||
1006 | new_height = height(); | ||
1007 | } | ||
1006 | frame().moveResize(new_x, new_y, new_width, new_height); | 1008 | frame().moveResize(new_x, new_y, new_width, new_height); |
1007 | 1009 | ||
1008 | setFocusFlag(focused); | 1010 | setFocusFlag(focused); |