fix 1052095, windowmenu doesnt close when tabs are changed (closed,new attached or dragged around)

This commit is contained in:
akir 2004-10-28 19:13:30 +00:00
parent 46d4d6bf6d
commit 14b781929e

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.304 2004/10/21 10:38:25 akir Exp $ // $Id: Window.cc,v 1.305 2004/10/28 19:13:30 akir Exp $
#include "Window.hh" #include "Window.hh"
@ -622,6 +622,8 @@ void FluxboxWindow::attachClient(WinClient &client) {
if (client.m_win == this) if (client.m_win == this)
return; return;
menu().hide();
// reparent client win to this frame // reparent client win to this frame
frame().setClientWindow(client); frame().setClientWindow(client);
FbTk::EventManager &evm = *FbTk::EventManager::instance(); FbTk::EventManager &evm = *FbTk::EventManager::instance();
@ -813,6 +815,8 @@ bool FluxboxWindow::removeClient(WinClient &client) {
setCurrentClient(*next_client, false); setCurrentClient(*next_client, false);
} }
menu().hide();
m_clientlist.remove(&client); m_clientlist.remove(&client);
if (m_client == &client) { if (m_client == &client) {
@ -2662,6 +2666,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
m_last_move_x, m_last_move_y, m_last_move_x, m_last_move_y,
active_button.width(), active_button.width(),
active_button.height()); active_button.height());
menu().hide();
} else { } else {
// we already grabed and started to drag'n'drop tab // we already grabed and started to drag'n'drop tab
// so we update drag'n'drop-rectangle // so we update drag'n'drop-rectangle