aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-03-09 18:33:36 (GMT)
committermathias <mathias>2006-03-09 18:33:36 (GMT)
commit1f0be0c59fec4c5b5dda7b7d3575946d1156d626 (patch)
treeb2234f9f62d0c8fa3277a4bb2c9033c22b3efad0
parent2a062eaa86a80ba7b1fb67e0e3098f400d149c11 (diff)
downloadfluxbox-1f0be0c59fec4c5b5dda7b7d3575946d1156d626.zip
fluxbox-1f0be0c59fec4c5b5dda7b7d3575946d1156d626.tar.bz2
applied patch from mark to fix a _net_wm_state_hidden issue
-rw-r--r--ChangeLog4
-rw-r--r--src/Ewmh.cc10
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 13b6062..2c13015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*06/03/07: 3*06/03/07:
4 * Bugfix for stuck icons (Thanks _markt) 4 * Bugfix for _net_wm_state_hidden (Thanks Mark)
5 Ewmh.cc
6 * Bugfix for stuck icons (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
5 IconbarTool.cc 7 IconbarTool.cc
6*06/03/05: 8*06/03/05:
7 * Update da_DK (danish) translation. 9 * Update da_DK (danish) translation.
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 911c919..fc762e7 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -885,6 +885,11 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) {
885 if ((value && !win.isFullscreen()) || 885 if ((value && !win.isFullscreen()) ||
886 (!value && win.isFullscreen())) 886 (!value && win.isFullscreen()))
887 setFullscreen(win, value); 887 setFullscreen(win, value);
888 } else if (state == m_net_wm_state_hidden) { // minimized
889 if (value && !win.isIconic())
890 win.iconify();
891 else if (!value && win.isIconic())
892 win.deiconify();
888 } else if (state == m_net_wm_state_skip_taskbar) { 893 } else if (state == m_net_wm_state_skip_taskbar) {
889 win.setIconHidden(value); 894 win.setIconHidden(value);
890 } else if (state == m_net_wm_state_below) { // bottom layer 895 } else if (state == m_net_wm_state_below) { // bottom layer
@@ -913,6 +918,11 @@ void Ewmh::toggleState(FluxboxWindow &win, Atom state) {
913 win.maximizeVertical(); 918 win.maximizeVertical();
914 } else if (state == m_net_wm_state_fullscreen) { // fullscreen 919 } else if (state == m_net_wm_state_fullscreen) { // fullscreen
915 setFullscreen(win, getState(win) == 0); // toggle current state 920 setFullscreen(win, getState(win) == 0); // toggle current state
921 } else if (state == m_net_wm_state_hidden) { // minimized
922 if(win.isIconic())
923 win.deiconify();
924 else
925 win.iconify();
916 } else if (state == m_net_wm_state_skip_taskbar) { 926 } else if (state == m_net_wm_state_skip_taskbar) {
917 win.setIconHidden(!win.isIconHidden()); 927 win.setIconHidden(!win.isIconHidden());
918 } else if (state == m_net_wm_state_below) { // bottom layer 928 } else if (state == m_net_wm_state_below) { // bottom layer