From 8b74aac150532d9bb60662414818e536ede6f29c Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Fri, 31 Aug 2012 12:15:11 +0900 Subject: [PATCH] [Title] fixed popup MenuDectectListener [Type] bugfix [Module] Emulator / menu [Priority] major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../src/org/tizen/emulator/skin/EmulatorSkin.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 69241718ee..d0513c6585 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 @@ -723,9 +723,11 @@ public class EmulatorSkin { 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); + Menu menu = EmulatorSkin.this.contextMenu; + + if (menu != null && EmulatorSkin.this.isMousePressed == false) { + shell.setMenu(menu); + menu.setVisible(true); e.doit = false; } else { shell.setMenu(null); @@ -761,7 +763,7 @@ public class EmulatorSkin { canvasMenuDetectListener = new MenuDetectListener() { @Override public void menuDetected(MenuDetectEvent e) { - Menu menu = shell.getMenu(); + Menu menu = EmulatorSkin.this.contextMenu; if (menu != null && EmulatorSkin.this.isDragStartedInLCD == false) { lcdCanvas.setMenu(menu); -- 2.34.1