menu: modified the scale menu visibility control

Change-Id: I64d3099878d8d7cb82325b310d5826e690634c22
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi b/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
index e5ad74fe1bd0b73cd0cddf459dfa70a3e97eb360..a960a9c538814f42d7d431570bcbd18dbf22c3f6 100644 (file)
--- a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
@@ -69,6 +69,7 @@
     <popupMenu>
         <topmostItem visible="true" />
         <rotateItem visible="true" />
+        <scaleItem visible="true" />
         <keywindowItem visible="true" />
         <shellItem visible="true" />
     </popupMenu>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index 9d24b218bc018d9da347c266554d18fa0aa0f6c4..b6d7389fb4ccba969ff9c6900c87d51f96df0a2c 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -175,8 +175,8 @@ public class PopupMenu {
                                scaleMenuType.getItemName().isEmpty() == false) ?
                                                scaleMenuType.getItemName() : SCALE_MENUITEM_NAME;
 
-               if (rotationMenuType == null ||
-                               (rotationMenuType != null && rotationMenuType.isVisible() == true)) {
+               if (scaleMenuType == null ||
+                               (scaleMenuType != null && scaleMenuType.isVisible() == true)) {
                        scaleItem = new MenuItem(menu, SWT.CASCADE);
                        scaleItem.setText(menuName);
                        scaleItem.setImage(imageRegistry.getIcon(IconName.SCALE));