From: giwoong.kim <giwoong.kim@samsung.com>
Date: Wed, 22 May 2013 07:56:08 +0000 (+0900)
Subject: skin: modified the z-order of window when AlwaysOnTop
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~970
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb494f2599d074b4254d12a26612eedb39a7a252;p=sdk%2Femulator%2Fqemu.git

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 502abffd0a..656816d39a 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -483,13 +483,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);
+						}
 					}
 				}
 			}