From 05510aa6897eedee6c64eac9077af087c367f33b Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Tue, 17 Jun 2014 19:31:44 +0900 Subject: [PATCH] menu: delete an unnecessary separator of menu item Change-Id: I4f970f4bd09c56f89e11ca54ffa2d137a83e66eb Signed-off-by: GiWoong Kim --- .../tizen/emulator/skin/menu/PopupMenu.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 d50fd0d592..96563d2097 100644 --- 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 @@ -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, -- 2.34.1