summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 79e0654..03a68db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/14: 3*07/01/14:
4 * Properly 'properly fix' shaded and stuck windows on restart -- i.e. allow
5 windows to deiconify themselves the rest of the time (Mark)
6 Window.cc
4 * Several changes for background style option: (Mark) 7 * Several changes for background style option: (Mark)
5 - now support `background: mod' to coincide with fbsetroot -mod -- 8 - now support `background: mod' to coincide with fbsetroot -mod --
6 In addition to `background.color' and `background.colorTo', this option 9 In addition to `background.color' and `background.colorTo', this option
diff --git a/src/Window.cc b/src/Window.cc
index a3a10c5..642a76b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2479,7 +2479,8 @@ void FluxboxWindow::mapRequestEvent(XMapRequestEvent &re) {
2479 destroyed = wsp->checkGrouping(*this); 2479 destroyed = wsp->checkGrouping(*this);
2480 2480
2481 // if we weren't grouped with another window we deiconify ourself 2481 // if we weren't grouped with another window we deiconify ourself
2482 if (!destroyed && !iconic) 2482 // make sure iconified windows stay that way on fluxbox start
2483 if (!destroyed && !(iconic && Fluxbox::instance()->isStartup()))
2483 deiconify(false); 2484 deiconify(false);
2484 2485
2485 } 2486 }