menu: delete an unnecessary separator of menu item 86/23086/1
authorGiWoong Kim <giwoong.kim@samsung.com>
Tue, 17 Jun 2014 10:31:44 +0000 (19:31 +0900)
committerGiWoong Kim <giwoong.kim@samsung.com>
Tue, 17 Jun 2014 10:32:31 +0000 (19:32 +0900)
Change-Id: I4f970f4bd09c56f89e11ca54ffa2d137a83e66eb
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java

index d50fd0d..96563d2 100644 (file)
@@ -275,6 +275,16 @@ public class PopupMenu {
                                }
                        }
 
+                       int cnt = advancedSubMenu.getItemCount();
+                       if (cnt > 0) {
+                               MenuItem endItem = advancedSubMenu.getItem(cnt - 1);
+                               if ((endItem.getStyle() & SWT.SEPARATOR) != 0) {
+                                       logger.info("delete unnecessary separator");
+
+                                       endItem.dispose();
+                               }
+                       }
+
                        if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null
                                        || aboutItem != null || forceCloseItem != null) {
                                advancedItem = new MenuItem(menu, SWT.CASCADE);
@@ -331,6 +341,16 @@ public class PopupMenu {
                                                                CLOSE_MENUITEM_NAME : closeMenuType.getItemName());
                        }
                }
+
+               int cnt = menu.getItemCount();
+               if (cnt > 0) {
+                       MenuItem endItem = menu.getItem(cnt - 1);
+                       if ((endItem.getStyle() & SWT.SEPARATOR) != 0) {
+                               logger.info("delete unnecessary separator");
+
+                               endItem.dispose();
+                       }
+               }
        }
 
        private MenuItem createMenuItem(Menu menu, int style,