From 7bf47691b077b1997abad840d2c83b507af9a686 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Wed, 22 May 2013 16:56:08 +0900 Subject: [PATCH] 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 --- .../client/src/org/tizen/emulator/skin/EmulatorSkin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 db530ed2b4..8dc4e3924a 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 @@ -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); + } } } } -- 2.34.1