summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-02-06 19:05:59 (GMT)
committermarkt <markt>2007-02-06 19:05:59 (GMT)
commit93d8310c0c51fe1edcdfa5240f724ab6306ce92a (patch)
tree52460913c58c6d28227adf7f5b7bf3b2671dd439
parent07ea9ec4b4a2c1252c64dc34438c4bdeb5e3331b (diff)
downloadfluxbox_lack-93d8310c0c51fe1edcdfa5240f724ab6306ce92a.zip
fluxbox_lack-93d8310c0c51fe1edcdfa5240f724ab6306ce92a.tar.bz2
wrong client was raised when attaching an unfocused window to the focused window
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 201a575..4a745e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/02/06: 3*07/02/06:
4 * Wrong window was being raised when attaching an unfocused window (Mark)
5 Window.cc
4 * Make selecting `close' from the workspace menu close the correct client, 6 * Make selecting `close' from the workspace menu close the correct client,
5 rather than the active tab in the window -- selecting `close' from right 7 rather than the active tab in the window -- selecting `close' from right
6 clicking on a tab is still wrong, as there are complications (Mark) 8 clicking on a tab is still wrong, as there are complications (Mark)
diff --git a/src/Window.cc b/src/Window.cc
index c505edc..56b1e09 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -676,6 +676,10 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
676 FocusControl::setFocusedWindow(&client); 676 FocusControl::setFocusedWindow(&client);
677 } else if (focused_win) 677 } else if (focused_win)
678 setCurrentClient(*focused_win, false); 678 setCurrentClient(*focused_win, false);
679 else
680 // reparenting puts the new client on top, but the old client is keeping
681 // the focus, so we raise it
682 m_client->raise();
679 683
680 frame().reconfigure(); 684 frame().reconfigure();
681} 685}