summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/window.c34
2 files changed, 22 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b6cb3ca..89ccedf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16 Thomas Thurman <thomas@thurman.org.uk>
+
+ Always set _NET_WM_STATE when a window is shown or
+ hidden, even if it wasn't mapped.
+
+ * src/window.c (meta_window_hide, meta_window_show):
+ call set_net_wm_state unconditionally
+
2006-03-16 Elijah Newren <newren gmail com>
Add debugging information for edge resistance
diff --git a/src/window.c b/src/window.c
index 7955102e..d11f7b3e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2018,17 +2018,14 @@ meta_window_show (MetaWindow *window)
}
}
- if (did_show)
- {
- set_net_wm_state (window);
+ set_net_wm_state (window);
- if (window->struts)
- {
- meta_topic (META_DEBUG_WORKAREA,
- "Mapped window %s with struts, so invalidating work areas\n",
- window->desc);
- invalidate_work_areas (window);
- }
+ if (did_show && window->struts)
+ {
+ meta_topic (META_DEBUG_WORKAREA,
+ "Mapped window %s with struts, so invalidating work areas\n",
+ window->desc);
+ invalidate_work_areas (window);
}
}
@@ -2071,17 +2068,14 @@ meta_window_hide (MetaWindow *window)
set_wm_state (window, IconicState);
}
- if (did_hide)
- {
- set_net_wm_state (window);
+ set_net_wm_state (window);
- if (window->struts)
- {
- meta_topic (META_DEBUG_WORKAREA,
- "Unmapped window %s with struts, so invalidating work areas\n",
- window->desc);
- invalidate_work_areas (window);
- }
+ if (did_hide && window->struts)
+ {
+ meta_topic (META_DEBUG_WORKAREA,
+ "Unmapped window %s with struts, so invalidating work areas\n",
+ window->desc);
+ invalidate_work_areas (window);
}
}