You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/09/04 18:06:10 UTC
svn commit: r811460 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin: MenuItemSkin.java
terra/TerraMenuPopupSkin.java
Author: gbrown
Date: Fri Sep 4 16:06:09 2009
New Revision: 811460
URL: http://svn.apache.org/viewvc?rev=811460&view=rev
Log:
Minor menu fixes.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java?rev=811460&r1=811459&r2=811460&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java Fri Sep 4 16:06:09 2009
@@ -44,9 +44,6 @@
@Override
public void windowClosed(Window window, Display display) {
- Menu.Item menuItem = (Menu.Item)getComponent();
- menuItem.setActive(false);
-
display.getContainerMouseListeners().remove(displayMouseListener);
}
};
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=811460&r1=811459&r2=811460&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Fri Sep 4 16:06:09 2009
@@ -197,6 +197,11 @@
MenuPopup menuPopup = (MenuPopup)window;
Menu menu = menuPopup.getMenu();
if (menu != null) {
+ Menu.Item activeItem = menu.getActiveItem();
+ if (activeItem != null) {
+ activeItem.setActive(false);
+ }
+
menu.requestFocus();
}
}