aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-02-17 17:37:34 (GMT)
committermarkt <markt>2007-02-17 17:37:34 (GMT)
commit58eb385351995aa7b5d9bbecd2b0dfa1d31e0dc8 (patch)
tree1d91e70f84050d62def0d003e35a6f93dd491c34
parent282326a9d00610c2fc84e35ab1fccbd99afb0bed (diff)
downloadfluxbox-58eb385351995aa7b5d9bbecd2b0dfa1d31e0dc8.zip
fluxbox-58eb385351995aa7b5d9bbecd2b0dfa1d31e0dc8.tar.bz2
fixed some issues with creating and alt-tabbing to transients of inactive tabs
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc14
2 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 85cafb9..786178f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/02/17:
4 * Fixed some issues with transients of inactive tabs (Mark)
5 Window.cc
3*07/02/10: 6*07/02/10:
4 * MaxSize and MinSize hints weren't getting updated properly -- bug #1560803 7 * MaxSize and MinSize hints weren't getting updated properly -- bug #1560803
5 (Mark + thanks Jim Ramsay) 8 (Mark + thanks Jim Ramsay)
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