aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/FbWinFrame.cc3
-rw-r--r--src/Window.cc5
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 37cd23a..a37fe57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1: 2Changes for 1.1:
3*07/06/03: 3*07/06/03:
4 * Deiconify when automatically tabbing to a minimized window with focus new
5 windows on, bug #1716899 (Mark)
6 Window.cc FbWinFrame.cc
4 * Submenus of slit menu were misbehaving with xinerama (Mark) 7 * Submenus of slit menu were misbehaving with xinerama (Mark)
5 Slit.cc 8 Slit.cc
6 * Also send transient windows when sending a window to another workspace, bug 9 * Also send transient windows when sending a window to another workspace, bug
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index dfdcf32..a387744 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -701,7 +701,8 @@ void FbWinFrame::setClientWindow(FbTk::FbWindow &win) {
701 XChangeWindowAttributes(win.display(), win.window(), CWEventMask|CWDontPropagate, &attrib_set); 701 XChangeWindowAttributes(win.display(), win.window(), CWEventMask|CWDontPropagate, &attrib_set);
702 702
703 m_clientarea.raise(); 703 m_clientarea.raise();
704 win.show(); 704 if (isVisible())
705 win.show();
705 win.raise(); 706 win.raise();
706 m_window.showSubwindows(); 707 m_window.showSubwindows();
707 708
diff --git a/src/Window.cc b/src/Window.cc
index d2a6e34..b50ee38 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -677,8 +677,11 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
677 } else { 677 } else {
678 if (!focused_win) 678 if (!focused_win)
679 focused_win = screen().focusControl().lastFocusedWindow(*this); 679 focused_win = screen().focusControl().lastFocusedWindow(*this);
680 if (focused_win) 680 if (focused_win) {
681 setCurrentClient(*focused_win, false); 681 setCurrentClient(*focused_win, false);
682 if (isIconic() && m_focused)
683 deiconify();
684 }
682 } 685 }
683 frame().reconfigure(); 686 frame().reconfigure();
684} 687}