aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-03-03 12:29:31 (GMT)
committerrathnor <rathnor>2004-03-03 12:29:31 (GMT)
commitf9fbd86c75181e6701bd93e174773a98b391382c (patch)
tree4778bbdc492deb21cc078a61748362f4c2f67e53
parentbf0b194d5fe611601bb8076b7a123a631da1f3ed (diff)
downloadfluxbox-f9fbd86c75181e6701bd93e174773a98b391382c.zip
fluxbox-f9fbd86c75181e6701bd93e174773a98b391382c.tar.bz2
fix outline moving windows being dropped on their own workspace
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc3
-rw-r--r--src/fluxbox.cc7
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d0a2ad..8c8bac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.9: 2Changes for 0.9.9:
3*04/03/03: 3*04/03/03:
4 * Fix outline moving dropping on source workspace made window
5 disappear [we now explicitly don't unfocus a moving window] (Simon)
6 Window.cc fluxbox.cc
4 * Updated finnish locales for fluxbox-generate_menu (Thanks Lauri Hakkarainen) 7 * Updated finnish locales for fluxbox-generate_menu (Thanks Lauri Hakkarainen)
5*04/03/02: 8*04/03/02:
6 * fluxbox-generate_menu changes: (Han) 9 * fluxbox-generate_menu changes: (Han)
diff --git a/src/Window.cc b/src/Window.cc
index f7d7bf2..7638306 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.268 2004/02/20 09:07:27 fluxgen Exp $ 25// $Id: Window.cc,v 1.269 2004/03/03 12:29:31 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2867,6 +2867,7 @@ void FluxboxWindow::resumeMoving() {
2867 2867
2868 if (m_workspace_number == screen().currentWorkspaceID()) { 2868 if (m_workspace_number == screen().currentWorkspaceID()) {
2869 frame().show(); 2869 frame().show();
2870 setInputFocus();
2870 } 2871 }
2871 2872
2872 FbTk::App::instance()->sync(false); 2873 FbTk::App::instance()->sync(false);
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e6099aa..119c22c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.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: fluxbox.cc,v 1.232 2004/02/27 12:30:17 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.233 2004/03/03 12:29:31 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -966,7 +966,10 @@ void Fluxbox::handleEvent(XEvent * const e) {
966#ifdef DEBUG 966#ifdef DEBUG
967 cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl; 967 cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl;
968#endif // DEBUG 968#endif // DEBUG
969 } else if (winclient && winclient == m_focused_window) 969 } else if (winclient && winclient == m_focused_window &&
970 (winclient->fbwindow() == 0
971 || !winclient->fbwindow()->isMoving()))
972 // we don't unfocus a moving window
970 setFocusedWindow(0); 973 setFocusedWindow(0);
971 } 974 }
972 break; 975 break;