From 19fae87f76a394521fc44a0646f1c4426725927d Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Mon, 14 Jan 2013 19:57:54 +0900 Subject: [PATCH] skin: control the focus in general skin for ubuntu 12.10 control the focus in general skin for ubuntu 12.10 Signed-off-by: GiWoong Kim --- .../client/src/org/tizen/emulator/skin/EmulatorSkin.java | 5 ++++- .../client/src/org/tizen/emulator/skin/custom/KeyWindow.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 73af0e6b67..265937a33b 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 @@ -476,7 +476,10 @@ public class EmulatorSkin { if (isOnTop == false && isKeyWindow == true) { if (keyWindow != null) { keyWindow.getShell().moveAbove(shell); - shell.moveAbove(keyWindow.getShell()); + + if (keyWindow.getDockPosition() != SWT.NONE) { + shell.moveAbove(keyWindow.getShell()); + } } } } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java index 3ba88e6f91..7bcf03bb77 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java @@ -295,6 +295,11 @@ public class KeyWindow extends SkinWindow { @Override public void mouseMove(MouseEvent e) { if (isGrabbedShell == true && e.button == 0/* left button */) { + if (getDockPosition() != SWT.NONE) { + dock(SWT.NONE, false, false); + shell.moveAbove(parent); + } + /* move a window */ Point previousLocation = shell.getLocation(); int x = previousLocation.x + (e.x - grabPosition.x); -- 2.34.1