skin: modified the z-order of window when AlwaysOnTop

modified the z-order of window when AlwaysOnTop

Change-Id: Ib74fb1a51c212dc4705b3f3298f4bf6126565036
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index db530ed2b4ac1ccc7fdf421a4e406a5cd50abf88..8dc4e3924ae359179c910fc4832b469218549f63 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -473,13 +473,17 @@ public class EmulatorSkin {
                        public void shellActivated(ShellEvent event) {
                                logger.info("activate");
 
-                               if (isOnTop == false && isKeyWindow == true) {
-                                       if (keyWindow != null) {
+                               if (keyWindow != null && isKeyWindow == true) {
+                                       if (isOnTop == false) {
                                                keyWindow.getShell().moveAbove(shell);
 
                                                if (keyWindow.getDockPosition() != SWT.NONE) {
                                                        shell.moveAbove(keyWindow.getShell());
                                                }
+                                       } else {
+                                               if (keyWindow.getDockPosition() == SWT.NONE) {
+                                                       keyWindow.getShell().moveAbove(shell);
+                                               }
                                        }
                                }
                        }