aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-11-04 17:36:40 (GMT)
committermarkt <markt>2007-11-04 17:36:40 (GMT)
commit64813f62fde1345c0130cb70b72cfc00d7698283 (patch)
treee597b25dbc0722d5bbcec03dfbb6d700a3150df8 /src/Window.cc
parent88f580ec0c7015462329846cf96560df79b140f7 (diff)
downloadfluxbox-64813f62fde1345c0130cb70b72cfc00d7698283.zip
fluxbox-64813f62fde1345c0130cb70b72cfc00d7698283.tar.bz2
a few random fixes
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 5e2f7c8..9184a80 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1954,7 +1954,7 @@ void FluxboxWindow::setFocusFlag(bool focus) {
1954 if (focus != frame().focused()) 1954 if (focus != frame().focused())
1955 frame().setFocus(focus); 1955 frame().setFocus(focus);
1956 1956
1957 if (screen().focusControl().isCycling()) 1957 if (focus && screen().focusControl().isCycling())
1958 tempRaise(); 1958 tempRaise();
1959 else if (screen().doAutoRaise()) { 1959 else if (screen().doAutoRaise()) {
1960 if (m_focused) 1960 if (m_focused)
@@ -2486,7 +2486,13 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2486 2486
2487 if (now.tv_sec > m_creation_time + 1) 2487 if (now.tv_sec > m_creation_time + 1)
2488 m_creation_time = 0; 2488 m_creation_time = 0;
2489 else { 2489 else if (Remember::instance().isRemembered(*client,
2490 Remember::REM_MAXIMIZEDSTATE) ||
2491 Remember::instance().isRemembered(*client,
2492 Remember::REM_FULLSCREENSTATE)) {
2493 cr.value_mask = cr.value_mask & ~(CWWidth | CWHeight);
2494 cr.value_mask = cr.value_mask & ~(CWX | CWY);
2495 } else {
2490 if (Remember::instance().isRemembered(*client, 2496 if (Remember::instance().isRemembered(*client,
2491 Remember::REM_DIMENSIONS)) 2497 Remember::REM_DIMENSIONS))
2492 cr.value_mask = cr.value_mask & ~(CWWidth | CWHeight); 2498 cr.value_mask = cr.value_mask & ~(CWWidth | CWHeight);