aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-23 09:58:49 (GMT)
committersimonb <simonb>2006-04-23 09:58:49 (GMT)
commit97c89e64b3899cbc6fc94b93574519344a79c750 (patch)
treec7e1ec831bff1392b6497d81652f760f49e02695
parent191acd188344e4f1d964274b9b9681e78d378b3e (diff)
downloadfluxbox-97c89e64b3899cbc6fc94b93574519344a79c750.zip
fluxbox-97c89e64b3899cbc6fc94b93574519344a79c750.tar.bz2
focus a window if it's the only one.
Thanks Jonas Koelker
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 283bb9d..f43c672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/23: 3*06/04/23:
4 * Focus singular windows on a workspace (Simon / thanks Jonas Koelker)
5 sf.net patch #1474722
6 Window.cc
4 * Tidy up window cycling, and make linear mode work in order of 7 * Tidy up window cycling, and make linear mode work in order of
5 creation (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org) 8 creation (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
6 FocusControl.hh/cc 9 FocusControl.hh/cc
diff --git a/src/Window.cc b/src/Window.cc
index 4ced1c6..7ffc1d5 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1546,7 +1546,8 @@ void FluxboxWindow::deiconify(bool reassoc, bool do_raise) {
1546 1546
1547 show(); 1547 show();
1548 1548
1549 if (was_iconic && screen().focusControl().focusNew()) 1549 // focus new, OR if it's the only window on the workspace
1550 if (was_iconic && (screen().focusControl().focusNew() || screen().currentWorkspace()->numberOfWindows() == 1))
1550 setInputFocus(); 1551 setInputFocus();
1551 1552
1552 1553