From 79ba675313ee5a8b0841bd32f01eeb54bace04bd Mon Sep 17 00:00:00 2001 From: mrjt Date: Thu, 8 Apr 2010 15:22:45 +0000 Subject: [PATCH] Docking Package: Fixed bug blocking key events from main window git-svn-id: svn://ultimatepp.org/upp/trunk@2314 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/Docking/DockCont.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bazaar/Docking/DockCont.cpp b/bazaar/Docking/DockCont.cpp index ae06808c0..f5dd7e3e7 100644 --- a/bazaar/Docking/DockCont.cpp +++ b/bazaar/Docking/DockCont.cpp @@ -250,8 +250,9 @@ void DockCont::ChildAdded(Ctrl *child) bool DockCont::Key(dword key, int count) { - PostCallback(callback1(base, &DockWindow::DoHotKeys, key)); - return true; + if (!IsDocked()) + PostCallback(callback1(base, &DockWindow::DoHotKeys, key)); + return !IsDocked(); } // The use of Single<> here is bad form, but I am unable to declare it a