nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cosmetic changes

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-08-16 04:36:08 -07:00
parent fe412dbeef
commit 06837ba864
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/CommandDialog.cc
View file

@ -93,11 +93,6 @@ void CommandDialog::show() {
void CommandDialog::hide() { void CommandDialog::hide() {
FbTk::FbWindow::hide(); FbTk::FbWindow::hide();
Fluxbox::instance()->setShowingDialog(false); Fluxbox::instance()->setShowingDialog(false);
// return focus to fluxbox window
if (FocusControl::focusedFbWindow())
FocusControl::focusedFbWindow()->focus();
} }
void CommandDialog::exposeEvent(XExposeEvent &event) { void CommandDialog::exposeEvent(XExposeEvent &event) {

22
src/fluxbox.cc
View file

@ -884,23 +884,19 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
return; return;
} }
WinClient *winclient = 0; WinClient *winclient = searchWindow(ue.window);
if ((winclient = searchWindow(ue.window)) != 0) { if (winclient != 0) {
if (winclient != 0) {
FluxboxWindow *win = winclient->fbwindow();
if (!win) {
delete winclient;
return;
}
// this should delete client and adjust m_focused_window if necessary
win->unmapNotifyEvent(ue);
FluxboxWindow *win = winclient->fbwindow();
if (!win) {
delete winclient;
return;
} }
// this should delete client and adjust m_focused_window if necessary
win->unmapNotifyEvent(ue);
// according to http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4 // according to http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4
// a XWithdrawWindow is // a XWithdrawWindow is
// 1) unmapping the window (which leads to the upper branch // 1) unmapping the window (which leads to the upper branch