aboutsummaryrefslogtreecommitdiff
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 379b08a..b1ef73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1: 2Changes for 1.1:
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 * Added key commands AddWorkspace and RemoveLastWorkspace (Mark) 8 * Added key commands AddWorkspace and RemoveLastWorkspace (Mark)
5 FbCommandFactory.cc WorkspaceCmd.cc/hh 9 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) {
1043 } else if (state == m_net_wm_state_below) { // bottom layer 1043 } else if (state == m_net_wm_state_below) { // bottom layer
1044 if (value) 1044 if (value)
1045 win.moveToLayer(Layer::BOTTOM); 1045 win.moveToLayer(Layer::BOTTOM);
1046 else 1046 else if (win.layerNum() > Layer::NORMAL)
1047 win.moveToLayer(Layer::NORMAL); 1047 win.moveToLayer(Layer::NORMAL);
1048
1049 } else if (state == m_net_wm_state_above) { // above layer 1048 } else if (state == m_net_wm_state_above) { // above layer
1050 if (value) 1049 if (value)
1051 win.moveToLayer(Layer::ABOVE_DOCK); 1050 win.moveToLayer(Layer::ABOVE_DOCK);
1052 else 1051 else if (win.layerNum() < Layer::NORMAL)
1053 win.moveToLayer(Layer::NORMAL); 1052 win.moveToLayer(Layer::NORMAL);
1054 } else if (state == m_net_wm_state_demands_attention) { 1053 } else if (state == m_net_wm_state_demands_attention) {
1055 if (value) { // if add attention 1054 if (value) { // if add attention