[mutter/wayland] Replace wm_state_modal usage with META_WINDOW_TYPE_DIALOG
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] Replace wm_state_modal usage with META_WINDOW_TYPE_DIALOG
- Date: Tue, 18 Mar 2014 16:45:19 +0000 (UTC)
commit 7504f16e591f18764c40bfbe14db99fd1a9f3627
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 18 10:58:26 2014 -0400
Replace wm_state_modal usage with META_WINDOW_TYPE_DIALOG
src/core/place.c | 2 +-
src/core/window.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/core/place.c b/src/core/place.c
index 613f270..6c0efc1 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -344,7 +344,7 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
/* denied_focus_and_not_transient is only set when focus_window != NULL */
if (window->denied_focus_and_not_transient &&
- window->wm_state_modal && /* FIXME: Maybe do this for all transients? */
+ window->type == META_WINDOW_MODAL_DIALOG &&
meta_window_same_application (window, focus_window) &&
window_overlaps_focus_window (window))
{
diff --git a/src/core/window.c b/src/core/window.c
index aade427..4a20adb 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5687,7 +5687,7 @@ get_modal_transient (MetaWindow *window)
MetaWindow *transient = tmp->data;
if (transient->transient_for == modal_transient &&
- transient->wm_state_modal)
+ transient->type == META_WINDOW_MODAL_DIALOG)
{
modal_transient = transient;
tmp = windows;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]