fix outline moving windows being dropped on their own workspace

This commit is contained in:
rathnor 2004-03-03 12:29:31 +00:00
parent bf0b194d5f
commit f9fbd86c75
3 changed files with 10 additions and 3 deletions

View file

@ -1,6 +1,9 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 0.9.9: Changes for 0.9.9:
*04/03/03: *04/03/03:
* Fix outline moving dropping on source workspace made window
disappear [we now explicitly don't unfocus a moving window] (Simon)
Window.cc fluxbox.cc
* Updated finnish locales for fluxbox-generate_menu (Thanks Lauri Hakkarainen) * Updated finnish locales for fluxbox-generate_menu (Thanks Lauri Hakkarainen)
*04/03/02: *04/03/02:
* fluxbox-generate_menu changes: (Han) * fluxbox-generate_menu changes: (Han)

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.268 2004/02/20 09:07:27 fluxgen Exp $ // $Id: Window.cc,v 1.269 2004/03/03 12:29:31 rathnor Exp $
#include "Window.hh" #include "Window.hh"
@ -2867,6 +2867,7 @@ void FluxboxWindow::resumeMoving() {
if (m_workspace_number == screen().currentWorkspaceID()) { if (m_workspace_number == screen().currentWorkspaceID()) {
frame().show(); frame().show();
setInputFocus();
} }
FbTk::App::instance()->sync(false); FbTk::App::instance()->sync(false);

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.232 2004/02/27 12:30:17 fluxgen Exp $ // $Id: fluxbox.cc,v 1.233 2004/03/03 12:29:31 rathnor Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -966,7 +966,10 @@ void Fluxbox::handleEvent(XEvent * const e) {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl; cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl;
#endif // DEBUG #endif // DEBUG
} else if (winclient && winclient == m_focused_window) } else if (winclient && winclient == m_focused_window &&
(winclient->fbwindow() == 0
|| !winclient->fbwindow()->isMoving()))
// we don't unfocus a moving window
setFocusedWindow(0); setFocusedWindow(0);
} }
break; break;