From 276706ab9d5b9a50ce5af2f5eef89be1aab93a39 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 9 Apr 2015 14:40:41 -0400
Subject: [PATCH] match client dialogs to client's layer

a small annoyance for literally over a decade has been that window
dialogs would sometimes start behind their owners. now they don't.
---
 src/bin/e_int_client_locks.c                  | 1 +
 src/bin/e_int_client_prop.c                   | 1 +
 src/bin/e_int_client_remember.c               | 1 +
 src/modules/conf_theme/e_int_config_borders.c | 1 +
 src/modules/shot/e_mod_main.c                 | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/bin/e_int_client_locks.c b/src/bin/e_int_client_locks.c
index 42ae50848..876865582 100644
--- a/src/bin/e_int_client_locks.c
+++ b/src/bin/e_int_client_locks.c
@@ -67,6 +67,7 @@ e_int_client_locks(E_Client *ec)
                                   "E", "_border_locks_dialog",
                                   NULL, 0, v, ec);
         ec->border_locks_dialog = cfd;
+        evas_object_layer_set(e_win_client_get(cfd->dia->win)->frame, ec->layer);
      }
 }
 
diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c
index 0905748e4..8e0f0d5d8 100644
--- a/src/bin/e_int_client_prop.c
+++ b/src/bin/e_int_client_prop.c
@@ -82,6 +82,7 @@ e_int_client_prop(E_Client *ec)
    elm_win_center(dia->win, 1, 1);
    e_dialog_show(dia);
    e_dialog_border_icon_set(dia, "preferences-system-windows");
+   evas_object_layer_set(e_win_client_get(dia->win)->frame, ec->layer);
 }
 
 static void
diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c
index 87dced408..c34cc43f8 100644
--- a/src/bin/e_int_client_remember.c
+++ b/src/bin/e_int_client_remember.c
@@ -111,6 +111,7 @@ e_int_client_remember(E_Client *ec)
                                   "E", "_border_remember_dialog",
                                   NULL, 0, v, ec);
         ec->border_remember_dialog = cfd;
+        evas_object_layer_set(e_win_client_get(cfd->dia->win)->frame, ec->layer);
      }
 }
 
diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c
index 59f5836e9..173572f7f 100644
--- a/src/modules/conf_theme/e_int_config_borders.c
+++ b/src/modules/conf_theme/e_int_config_borders.c
@@ -50,6 +50,7 @@ e_int_config_borders_border(E_Comp *comp EINA_UNUSED, const char *params)
                              "E", "_config_border_border_style_dialog",
                              "preferences-system-windows", 0, v, ec);
    ec->border_border_dialog = cfd;
+   evas_object_layer_set(e_win_client_get(cfd->dia->win)->frame, ec->layer);
    return cfd;
 }
 
diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 90ea95e07..08896e526 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -867,6 +867,7 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
         e_win_client_icon_set(win, "screenshot");
 
         if (!e_widget_focus_get(o_bg)) e_widget_focus_set(o_box, 1);
+        evas_object_layer_set(e_win_client_get(win)->frame, ec->layer);
      }
 }