aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-13 11:14:05 (GMT)
committerrathnor <rathnor>2003-05-13 11:14:05 (GMT)
commite7903086f27a6112cf7579290dc4888631dc604c (patch)
tree952a24623bbe195dd859114585b43428171f2d1c
parent3b1306336343ccf7b0faa065ba4c5842561b1caf (diff)
downloadfluxbox_paul-e7903086f27a6112cf7579290dc4888631dc604c.zip
fluxbox_paul-e7903086f27a6112cf7579290dc4888631dc604c.tar.bz2
fix iconify with autoraise
-rw-r--r--ChangeLog2
-rw-r--r--src/Screen.cc3
-rw-r--r--src/Window.cc4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b3433e9..68e7a3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.3: 2Changes for 0.9.3:
3*03/05/13: 3*03/05/13:
4 * Fixed iconify problems when autoraise on (Simon)
5 Window.cc Screen.cc
4 * Fixed restoring submenus after a reconfigure (Thanks MrChuoi) 6 * Fixed restoring submenus after a reconfigure (Thanks MrChuoi)
5 Screen.cc, fluxbox.cc/hh 7 Screen.cc, fluxbox.cc/hh
6 * Added auto hide menu item to toolbar menu (Thanks MrChuoi) 8 * Added auto hide menu item to toolbar menu (Thanks MrChuoi)
diff --git a/src/Screen.cc b/src/Screen.cc
index e579136..88c764d 100644
--- a/src/Screen.cc
+++ b/src/Screen.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: Screen.cc,v 1.160 2003/05/13 00:23:05 fluxgen Exp $ 25// $Id: Screen.cc,v 1.161 2003/05/13 11:14:04 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -2491,6 +2491,7 @@ WinClient *BScreen::getLastFocusedWindow(int workspace) {
2491 for (; it != it_end; ++it) 2491 for (; it != it_end; ++it)
2492 if ((*it)->fbwindow() && 2492 if ((*it)->fbwindow() &&
2493 (((int)(*it)->fbwindow()->getWorkspaceNumber()) == workspace 2493 (((int)(*it)->fbwindow()->getWorkspaceNumber()) == workspace
2494 && !(*it)->fbwindow()->isIconic()
2494 && (!(*it)->fbwindow()->isStuck() || (*it)->fbwindow()->isFocused()))) 2495 && (!(*it)->fbwindow()->isStuck() || (*it)->fbwindow()->isFocused())))
2495 // only give focus to a stuck window if it is currently focused 2496 // only give focus to a stuck window if it is currently focused
2496 // otherwise they tend to override normal workspace focus 2497 // otherwise they tend to override normal workspace focus
diff --git a/src/Window.cc b/src/Window.cc
index 4410f5a..1c47fa7 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.172 2003/05/11 23:44:08 rathnor Exp $ 25// $Id: Window.cc,v 1.173 2003/05/13 11:14:05 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1240,6 +1240,8 @@ void FluxboxWindow::iconify() {
1240 (*it)->fbwindow()->iconify(); 1240 (*it)->fbwindow()->iconify();
1241 } 1241 }
1242 } 1242 }
1243 if (Fluxbox::instance()->getFocusedWindow() == this)
1244 Fluxbox::instance()->revertFocus(screen());
1243 1245
1244} 1246}
1245 1247