[Title] disable popup menu when dragging in skin

[Type] feature
[Module] Emulator
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

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 d79dac9b0c013c0dba96d98d25ed007ac4a6883c..25cdc9d76a549620a26bb26be249099830b89e3f 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
@@ -158,6 +158,7 @@ public class EmulatorSkin {
        private boolean isOnUsbKbd;
 
        private ScreenShotDialog screenShotDialog;
+       private Menu contextMenu;
 
        private SocketCommunicator communicator;
        private long windowHandleId;
@@ -167,6 +168,7 @@ public class EmulatorSkin {
        private MouseTrackListener shellMouseTrackListener;
        private MouseMoveListener shellMouseMoveListener;
        private MouseListener shellMouseListener;
+       private MenuDetectListener shellMenuDetectListener;
 
        //private DragDetectListener canvasDragDetectListener;
        private MouseMoveListener canvasMouseMoveListener;
@@ -256,16 +258,14 @@ public class EmulatorSkin {
        }
 
        private void setMenu() {
+               contextMenu = new Menu(shell);
 
-               Menu contextMenu = new Menu( shell );
+               addMenuItems(shell, contextMenu);
 
-               addMenuItems( shell, contextMenu );
-
-               addShellListener( shell );
-               addCanvasListener( shell, lcdCanvas );
-
-               shell.setMenu( contextMenu );
+               addShellListener(shell);
+               addCanvasListener(shell, lcdCanvas);
 
+               shell.setMenu(contextMenu);
        }
 
 //     private void readyToReopen( EmulatorSkin sourceSkin, boolean isOnTop ) {
@@ -707,6 +707,20 @@ public class EmulatorSkin {
 
                shell.addMouseListener( shellMouseListener );
 
+               shellMenuDetectListener = new MenuDetectListener() {
+                       @Override
+                       public void menuDetected(MenuDetectEvent e) {
+                               if (EmulatorSkin.this.contextMenu != null && EmulatorSkin.this.isMousePressed == false) {
+                                       shell.setMenu(EmulatorSkin.this.contextMenu);
+                                       EmulatorSkin.this.contextMenu.setVisible(true);
+                                       e.doit = false;
+                               } else {
+                                       shell.setMenu(null);
+                               }
+                       }
+               };
+
+               shell.addMenuDetectListener(shellMenuDetectListener);
        }
 
        private void removeShellListeners() {