summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-02-19 16:04:59 (GMT)
committermarkt <markt>2007-02-19 16:04:59 (GMT)
commitbd3d8d5c8da9a1db58108c3b26257d7bb3d3139c (patch)
tree54996d4506355e71fc5b4d69fcfe8bb44ddc156a
parentca710b371b500d29c6849e568c43f746a787bc5f (diff)
downloadfluxbox_lack-bd3d8d5c8da9a1db58108c3b26257d7bb3d3139c.zip
fluxbox_lack-bd3d8d5c8da9a1db58108c3b26257d7bb3d3139c.tar.bz2
fixed some strange behavior with tabbing a transient to its main window
-rw-r--r--src/Ewmh.cc2
-rw-r--r--src/Window.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 646fa0e..ce5f1a3 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -328,6 +328,8 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
328 changeProperty(m_net_wm_window_type, 328 changeProperty(m_net_wm_window_type,
329 XA_ATOM, 32, PropModeReplace, 329 XA_ATOM, 32, PropModeReplace,
330 (unsigned char*)&m_net_wm_window_type_dialog, 1); 330 (unsigned char*)&m_net_wm_window_type_dialog, 1);
331 // and then we should treat it like a dialog
332 win.setTabable(false);
331 } 333 }
332 } 334 }
333 335
diff --git a/src/Window.cc b/src/Window.cc
index 36bd271..ccdb477 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1887,7 +1887,8 @@ void FluxboxWindow::raise() {
1887 // raise this window and every transient in it with this one last 1887 // raise this window and every transient in it with this one last
1888 if (client->fbwindow()) { 1888 if (client->fbwindow()) {
1889 // doing this on startup messes up the focus order 1889 // doing this on startup messes up the focus order
1890 if (!Fluxbox::instance()->isStartup()) 1890 if (!Fluxbox::instance()->isStartup() && client->fbwindow() != this &&
1891 &client->fbwindow()->winClient() != client)
1891 // activate the client so the transient won't get pushed back down 1892 // activate the client so the transient won't get pushed back down
1892 client->fbwindow()->setCurrentClient(*client, false); 1893 client->fbwindow()->setCurrentClient(*client, false);
1893 raiseFluxboxWindow(*client->fbwindow()); 1894 raiseFluxboxWindow(*client->fbwindow());