aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-10-28 19:13:30 (GMT)
committerakir <akir>2004-10-28 19:13:30 (GMT)
commit14b781929eee82703fb01e91e2c7e8a63dd08c7b (patch)
tree0862b0f759a426c6194cf3c5d3e04b2dc2f243b0
parent46d4d6bf6d47fae7f77c0c9d8480e152b31609eb (diff)
downloadfluxbox_paul-14b781929eee82703fb01e91e2c7e8a63dd08c7b.zip
fluxbox_paul-14b781929eee82703fb01e91e2c7e8a63dd08c7b.tar.bz2
fix 1052095, windowmenu doesnt close when tabs are changed (closed,new attached or dragged around)
-rw-r--r--src/Window.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 88d12b0..ccf0748 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.304 2004/10/21 10:38:25 akir Exp $ 25// $Id: Window.cc,v 1.305 2004/10/28 19:13:30 akir Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -622,6 +622,8 @@ void FluxboxWindow::attachClient(WinClient &client) {
622 if (client.m_win == this) 622 if (client.m_win == this)
623 return; 623 return;
624 624
625 menu().hide();
626
625 // reparent client win to this frame 627 // reparent client win to this frame
626 frame().setClientWindow(client); 628 frame().setClientWindow(client);
627 FbTk::EventManager &evm = *FbTk::EventManager::instance(); 629 FbTk::EventManager &evm = *FbTk::EventManager::instance();
@@ -813,6 +815,8 @@ bool FluxboxWindow::removeClient(WinClient &client) {
813 setCurrentClient(*next_client, false); 815 setCurrentClient(*next_client, false);
814 } 816 }
815 817
818 menu().hide();
819
816 m_clientlist.remove(&client); 820 m_clientlist.remove(&client);
817 821
818 if (m_client == &client) { 822 if (m_client == &client) {
@@ -2662,6 +2666,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2662 m_last_move_x, m_last_move_y, 2666 m_last_move_x, m_last_move_y,
2663 active_button.width(), 2667 active_button.width(),
2664 active_button.height()); 2668 active_button.height());
2669
2670 menu().hide();
2665 } else { 2671 } else {
2666 // we already grabed and started to drag'n'drop tab 2672 // we already grabed and started to drag'n'drop tab
2667 // so we update drag'n'drop-rectangle 2673 // so we update drag'n'drop-rectangle