aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authormarkt <markt>2006-07-06 04:10:34 (GMT)
committermarkt <markt>2006-07-06 04:10:34 (GMT)
commit84ca1f2e2f82b66b417b8e25295e37cb07985f3d (patch)
tree846093f50a65a5a1af8fd1563e66e4d4560f1d44 /src/Window.cc
parentb407e121badd48b0fd3fdfe2e47a5ac3bfa7f047 (diff)
downloadfluxbox_pavel-84ca1f2e2f82b66b417b8e25295e37cb07985f3d.zip
fluxbox_pavel-84ca1f2e2f82b66b417b8e25295e37cb07985f3d.tar.bz2
re-fixing the focus after fixing the crash bug
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 80b7ef6..03bde16 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -703,11 +703,9 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
703 m_workspacesig.notify(); 703 m_workspacesig.notify();
704 m_layersig.notify(); 704 m_layersig.notify();
705 705
706 if (was_focused != 0) { 706 if (was_focused != 0)
707 // already has focus, we're just assuming the state of the old window 707 // already has focus, we're just assuming the state of the old window
708 setCurrentClient(*was_focused, false); 708 FocusControl::setFocusedWindow(&client);
709 frame().setFocus(true);
710 }
711 709
712 frame().reconfigure(); 710 frame().reconfigure();
713 711
@@ -776,10 +774,8 @@ void FluxboxWindow::detachCurrentClient() {
776 return; 774 return;
777 WinClient &client = *m_client; 775 WinClient &client = *m_client;
778 detachClient(*m_client); 776 detachClient(*m_client);
779 if (client.fbwindow() != 0) { 777 if (client.fbwindow() != 0)
780 client.fbwindow()->show(); 778 client.fbwindow()->show();
781 FocusControl::setFocusedWindow(&client);
782 }
783} 779}
784 780
785/// removes client from client list, does not create new fluxboxwindow for it 781/// removes client from client list, does not create new fluxboxwindow for it