diff options
author | fluxgen <fluxgen> | 2002-09-09 10:01:41 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-09-09 10:01:41 (GMT) |
commit | a7dc6a68c91bafbc59e2239ef89e546831febcfd (patch) | |
tree | d80bc8c774a9d2e8c13c724a6bc738773d92c4c5 /src/Workspace.cc | |
parent | 245f8390a513be6865dfaba7ab42a1a0daf302c6 (diff) | |
download | fluxbox-a7dc6a68c91bafbc59e2239ef89e546831febcfd.zip fluxbox-a7dc6a68c91bafbc59e2239ef89e546831febcfd.tar.bz2 |
minor stuff
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r-- | src/Workspace.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index 631fe69..d68e400 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Workspace.cc,v 1.27 2002/09/08 19:38:48 fluxgen Exp $ | 25 | // $Id: Workspace.cc,v 1.28 2002/09/09 10:00:24 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Workspace.hh" | 27 | #include "Workspace.hh" |
28 | 28 | ||
@@ -164,10 +164,10 @@ int Workspace::removeWindow(FluxboxWindow *w) { | |||
164 | w->getTransientFor()->setInputFocus(); | 164 | w->getTransientFor()->setInputFocus(); |
165 | } else { | 165 | } else { |
166 | FluxboxWindow *top = 0; | 166 | FluxboxWindow *top = 0; |
167 | if (stackingList.size()!=0) | 167 | if (stackingList.size() != 0) |
168 | top = stackingList.front(); | 168 | top = stackingList.front(); |
169 | 169 | ||
170 | if (!top || !top->setInputFocus()) { | 170 | if (top == 0|| !top->setInputFocus()) { |
171 | Fluxbox::instance()->setFocusedWindow(0); // set focused window to none | 171 | Fluxbox::instance()->setFocusedWindow(0); // set focused window to none |
172 | XSetInputFocus(Fluxbox::instance()->getXDisplay(), | 172 | XSetInputFocus(Fluxbox::instance()->getXDisplay(), |
173 | screen->getToolbar()->getWindowID(), | 173 | screen->getToolbar()->getWindowID(), |
@@ -210,11 +210,7 @@ void Workspace::showAll(void) { | |||
210 | WindowStack::iterator it = stackingList.begin(); | 210 | WindowStack::iterator it = stackingList.begin(); |
211 | WindowStack::iterator it_end = stackingList.end(); | 211 | WindowStack::iterator it_end = stackingList.end(); |
212 | for (; it != it_end; ++it) { | 212 | for (; it != it_end; ++it) { |
213 | if ((*it) == 0) { | 213 | (*it)->deiconify(false, false); |
214 | stackingList.erase(it); | ||
215 | } else { | ||
216 | (*it)->deiconify(False, False); | ||
217 | } | ||
218 | } | 214 | } |
219 | } | 215 | } |
220 | 216 | ||