skin: define redock function

define redock function for Key Window

Change-Id: Ic69edf714019a1f8c23aa40d92c78925956e3814
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 463f382b661808ed37dc7182bb97f8720ed1de3b..ef3f5becba2c3329eaed2b799b1d6408ab6a67c6 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
@@ -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 77618eda7a967a70cf92fd34952768e3f5b66d79..a333fed298a905e525519cf63d164a9fa8168d59 100644 (file)
--- 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 aa4475d26de062cb75162622b1085add1d5ca469..c47ad63e76cb48571f5fb935cf2cd52c3128d844 100644 (file)
--- 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);
                                        }
                                }
                        }