aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/Window.cc b/src/Window.cc
index c324087..0deecd2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1887,11 +1887,11 @@ void FluxboxWindow::raise() {
1887 } 1887 }
1888 // raise this window and every transient in it with this one last 1888 // raise this window and every transient in it with this one last
1889 if (client->fbwindow()) { 1889 if (client->fbwindow()) {
1890 raiseFluxboxWindow(*client->fbwindow());
1891 // doing this on startup messes up the focus order 1890 // doing this on startup messes up the focus order
1892 if (!Fluxbox::instance()->isStartup()) 1891 if (!Fluxbox::instance()->isStartup())
1893 // 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
1894 client->fbwindow()->setCurrentClient(*client, false); 1893 client->fbwindow()->setCurrentClient(*client, false);
1894 raiseFluxboxWindow(*client->fbwindow());
1895 } 1895 }
1896 1896
1897} 1897}
@@ -1917,15 +1917,9 @@ void FluxboxWindow::tempRaise() {
1917 if (isIconic()) 1917 if (isIconic())
1918 deiconify(); 1918 deiconify();
1919 1919
1920 // get root window 1920 // the root transient will get raised when we stop cycling
1921 WinClient *client = getRootTransientFor(m_client); 1921 // raising it here causes problems when it isn't the active tab
1922 1922 tempRaiseFluxboxWindow(*this);
1923 // if we don't have any root window use this as root
1924 if (client == 0)
1925 client = m_client;
1926
1927 if (client->fbwindow())
1928 tempRaiseFluxboxWindow(*client->fbwindow());
1929} 1923}
1930 1924
1931 1925