From f359e812c6407aae3b86e6314be1a1c2e7b08236 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Fri, 12 Jul 2013 14:51:47 +0900 Subject: [PATCH] skin: define redock function define redock function for Key Window Change-Id: Ic69edf714019a1f8c23aa40d92c78925956e3814 Signed-off-by: GiWoong Kim --- .../src/org/tizen/emulator/skin/EmulatorSkin.java | 13 +++++++++++-- .../src/org/tizen/emulator/skin/custom/SkinWindow.java | 4 ++++ .../skin/layout/GeneralPurposeSkinComposer.java | 18 ++++++------------ 3 files changed, 21 insertions(+), 14 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 463f382..ef3f5be 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 @@ -652,6 +652,10 @@ public class EmulatorSkin { canvasMouseListener = new MouseListener() { @Override public void mouseUp(MouseEvent e) { + if (keyWindow != null) { + keyWindow.redock(false, false); + } + if (1 == e.button) /* left button */ { if (true == isDisplayDragging) { @@ -1338,8 +1342,13 @@ public class EmulatorSkin { public void widgetSelected(SelectionEvent e) { if (isSelectKeyWindowMenu() == true) { if (keyWindow == null) { - openKeyWindow(recentlyDocked, false); - recentlyDocked = SWT.NONE; + if (recentlyDocked != SWT.NONE) { + openKeyWindow(recentlyDocked, false); + recentlyDocked = SWT.NONE; + } else { + /* opening for first time */ + openKeyWindow(SWT.RIGHT | SWT.CENTER, false); + } } else { openKeyWindow(keyWindow.getDockPosition(), false); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java index 77618ed..a333fed 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java @@ -144,6 +144,10 @@ public class SkinWindow { shell.setLocation(x, y); } + public void redock(boolean correction, boolean enableLogger) { + dock(getDockPosition(), correction, enableLogger); + } + public int getDockPosition() { return dockPosition; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java index aa4475d..c47ad63 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java @@ -391,10 +391,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { e.gc.drawImage(currentState.getCurrentImage(), 0, 0); } - if (skin.keyWindow != null && - skin.keyWindow.getDockPosition() != SWT.NONE) { - skin.keyWindow.dock( - skin.keyWindow.getDockPosition(), false, false); + if (skin.keyWindow != null) { + skin.keyWindow.redock(false, false); } } }; @@ -412,10 +410,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { shell.setLocation(x, y); - if (skin.keyWindow != null && - skin.keyWindow.getDockPosition() != SWT.NONE) { - skin.keyWindow.dock( - skin.keyWindow.getDockPosition(), false, false); + if (skin.keyWindow != null) { + skin.keyWindow.redock(false, false); } } } @@ -432,10 +428,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { isGrabbedShell = false; grabPosition.x = grabPosition.y = 0; - if (skin.keyWindow != null && - skin.keyWindow.getDockPosition() != SWT.NONE) { - skin.keyWindow.dock( - skin.keyWindow.getDockPosition(), false, true); + if (skin.keyWindow != null) { + skin.keyWindow.redock(false, true); } } } -- 2.7.4