summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/Ewmh.cc5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 330e3f2..3e459b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/06/03:
4 * Only change layer to normal when removing _NET_WM_STATE_{ABOVE,BELOW} if
5 the window is actually above/below the normal layer (thanks Jim Ramsay)
6 Ewmh.cc
3*07/06/01: 7*07/06/01:
4 * Fixed infinite loop caused by removing the last workspace when it contains 8 * Fixed infinite loop caused by removing the last workspace when it contains
5 windows (Mark) 9 windows (Mark)
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 147b7d3..fc4e3e1 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -1058,13 +1058,12 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) {
1058 } else if (state == m_net_wm_state_below) { // bottom layer 1058 } else if (state == m_net_wm_state_below) { // bottom layer
1059 if (value) 1059 if (value)
1060 win.moveToLayer(Layer::BOTTOM); 1060 win.moveToLayer(Layer::BOTTOM);
1061 else 1061 else if (win.layerNum() > Layer::NORMAL)
1062 win.moveToLayer(Layer::NORMAL); 1062 win.moveToLayer(Layer::NORMAL);
1063
1064 } else if (state == m_net_wm_state_above) { // above layer 1063 } else if (state == m_net_wm_state_above) { // above layer
1065 if (value) 1064 if (value)
1066 win.moveToLayer(Layer::ABOVE_DOCK); 1065 win.moveToLayer(Layer::ABOVE_DOCK);
1067 else 1066 else if (win.layerNum() < Layer::NORMAL)
1068 win.moveToLayer(Layer::NORMAL); 1067 win.moveToLayer(Layer::NORMAL);
1069 } else if (state == m_net_wm_state_demands_attention) { 1068 } else if (state == m_net_wm_state_demands_attention) {
1070 if (value) { // if add attention 1069 if (value) { // if add attention