From 785f5f705b2c00c4527d6b8cf4cbbb2f6d687364 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 3 Jun 2007 20:10:14 +0000 Subject: fixes a bug with rox panel flickering with mousefocus --- ChangeLog | 4 ++++ src/Ewmh.cc | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 379b08a..b1ef73a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ (Format: Year/Month/Day) Changes for 1.1: +*07/06/03: + * Only change layer to normal when removing _NET_WM_STATE_{ABOVE,BELOW} if + the window is actually above/below the normal layer (thanks Jim Ramsay) + Ewmh.cc *07/06/01: * Added key commands AddWorkspace and RemoveLastWorkspace (Mark) FbCommandFactory.cc WorkspaceCmd.cc/hh diff --git a/src/Ewmh.cc b/src/Ewmh.cc index b0269ec..5c6d70b 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc @@ -1043,13 +1043,12 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) { } else if (state == m_net_wm_state_below) { // bottom layer if (value) win.moveToLayer(Layer::BOTTOM); - else + else if (win.layerNum() > Layer::NORMAL) win.moveToLayer(Layer::NORMAL); - } else if (state == m_net_wm_state_above) { // above layer if (value) win.moveToLayer(Layer::ABOVE_DOCK); - else + else if (win.layerNum() < Layer::NORMAL) win.moveToLayer(Layer::NORMAL); } else if (state == m_net_wm_state_demands_attention) { if (value) { // if add attention -- cgit v0.11.2