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/08/11 20:00:50 UTC

svn commit: r803235 - in /incubator/pivot/trunk/wtk: src/org/apache/pivot/wtk/ src/org/apache/pivot/wtk/skin/ src/org/apache/pivot/wtk/skin/terra/ test/org/apache/pivot/wtk/test/

Author: gbrown
Date: Tue Aug 11 18:00:50 2009
New Revision: 803235

URL: http://svn.apache.org/viewvc?rev=803235&view=rev
Log:
Preliminary work on PIVOT-213.

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBarListener.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
    incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java Tue Aug 11 18:00:50 2009
@@ -449,7 +449,16 @@
         return component;
     }
 
-    protected Component transferFocus(Component component, Direction direction) {
+    /**
+     * Transfers focus to the next focusable component.
+     *
+     * @param component
+     * The component from which focus will be transferred.
+     *
+     * @param direction
+     * The direction in which to transfer focus.
+     */
+    public Component transferFocus(Component component, Direction direction) {
         if (focusTraversalPolicy == null) {
             // The container has no traversal policy; move up a level
             component = transferFocus(direction);

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java Tue Aug 11 18:00:50 2009
@@ -26,7 +26,7 @@
 
 
 /**
- * Component representing a horizontal menu bar.
+ * Component representing a menu bar.
  *
  * @author gbrown
  */
@@ -59,6 +59,7 @@
 
         public Item(Object buttonData) {
             super(buttonData);
+            super.setToggleButton(true);
 
             setDataRenderer(DEFAULT_DATA_RENDERER);
             installSkin(Item.class);
@@ -102,7 +103,7 @@
 
         @Override
         public void setToggleButton(boolean toggleButton) {
-            throw new UnsupportedOperationException("Menu bar items cannot be toggle buttons.");
+            throw new UnsupportedOperationException("Menu bar items are always toggle buttons.");
         }
 
         public ListenerList<ItemListener> getItemListeners() {
@@ -139,6 +140,7 @@
 
             MenuBar.this.add(item);
             items.insert(item, index);
+            item.setGroup(itemGroup);
             item.setMenuBar(MenuBar.this);
 
             menuBarListeners.itemInserted(MenuBar.this, index);
@@ -162,6 +164,7 @@
 
             for (int i = 0, n = removed.getLength(); i < n; i++) {
                 Item item = removed.get(i);
+                item.setGroup((Button.Group)null);
                 item.setMenuBar(null);
                 MenuBar.this.remove(item);
             }
@@ -201,19 +204,12 @@
                 listener.itemsRemoved(menuBar, index, removed);
             }
         }
-
-        public void activeChanged(MenuBar menuBar) {
-            for (MenuBarListener listener : this) {
-                listener.activeChanged(menuBar);
-            }
-        }
     }
 
     private ArrayList<Item> items = new ArrayList<Item>();
+    private Button.Group itemGroup = new Button.Group();
     private ItemSequence itemSequence = new ItemSequence();
 
-    private boolean active = false;
-
     private MenuBarListenerList menuBarListeners = new MenuBarListenerList();
 
     public MenuBar() {
@@ -224,15 +220,47 @@
         return itemSequence;
     }
 
-    public boolean isActive() {
-        return active;
+    public Item getSelectedItem() {
+        return (Item)itemGroup.getSelection();
     }
 
-    public void setActive(boolean active) {
-        if (this.active != active) {
-            this.active = active;
+    public void selectNextItem() {
+        int n = items.getLength();
+
+        if (n > 0) {
+            int index = n;
+
+            Item selectedItem = getSelectedItem();
+            if (selectedItem != null) {
+                index = items.indexOf(selectedItem) + 1;
+            }
+
+            if (index == n) {
+                index = 0;
+            }
+
+            selectedItem = items.get(index);
+            selectedItem.setSelected(true);
+        }
+    }
+
+    public void selectPreviousItem() {
+        int n = items.getLength();
+
+        if (n > 0) {
+            int index = -1;
+
+            Item selectedItem = getSelectedItem();
+            if (selectedItem != null) {
+                index = items.indexOf(selectedItem) - 1;
+            }
+
+            if (index < 0) {
+                index = n - 1;
+            }
 
-            menuBarListeners.activeChanged(this);
+            selectedItem = items.get(index);
+            selectedItem.setSelected(true);
         }
     }
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBarListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBarListener.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBarListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBarListener.java Tue Aug 11 18:00:50 2009
@@ -40,11 +40,4 @@
      * @param removed
      */
     public void itemsRemoved(MenuBar menuBar, int index, Sequence<MenuBar.Item> removed);
-
-    /**
-     * Called when the menu bar's active state has changed.
-     *
-     * @param menuBar
-     */
-    public void activeChanged(MenuBar menuBar);
 }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java Tue Aug 11 18:00:50 2009
@@ -244,6 +244,8 @@
                     if (fill) {
                         componentHeight = Math.max(height - (padding.top
                             + padding.bottom), 0);
+
+                        component.invalidate();
                         componentWidth = component.getPreferredWidth(componentHeight);
                     } else {
                         Dimensions preferredComponentSize = component.getPreferredSize();
@@ -309,6 +311,7 @@
                         componentWidth = Math.max(width - (padding.left
                             + padding.right), 0);
 
+                        component.invalidate();
                         componentHeight = component.getPreferredHeight(componentWidth);
                     } else {
                         Dimensions preferredComponentSize = component.getPreferredSize();

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java Tue Aug 11 18:00:50 2009
@@ -19,7 +19,6 @@
 import org.apache.pivot.wtk.Button;
 import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.ComponentKeyListener;
-import org.apache.pivot.wtk.Direction;
 import org.apache.pivot.wtk.Display;
 import org.apache.pivot.wtk.Keyboard;
 import org.apache.pivot.wtk.Menu;
@@ -38,30 +37,26 @@
 public abstract class MenuBarItemSkin extends ButtonSkin implements MenuBar.ItemListener {
     protected MenuPopup menuPopup = new MenuPopup();
 
-    private ComponentKeyListener menuPopupComponentKeyListener = new ComponentKeyListener() {
-        public boolean keyTyped(Component component, char character) {
-            return false;
-        }
-
+    private ComponentKeyListener menuPopupComponentKeyListener = new ComponentKeyListener.Adapter() {
         public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+            boolean consumed = false;
+
             MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
+            MenuBar menuBar = menuBarItem.getMenuBar();
 
             if (keyCode == Keyboard.KeyCode.LEFT
                 || (keyCode == Keyboard.KeyCode.TAB
                     && Keyboard.isPressed(Keyboard.Modifier.SHIFT))) {
-                menuBarItem.transferFocus(Direction.BACKWARD);
+                menuBar.selectPreviousItem();
+                consumed = true;
+
             } else if (keyCode == Keyboard.KeyCode.RIGHT
                 || keyCode == Keyboard.KeyCode.TAB) {
-                menuBarItem.transferFocus(Direction.FORWARD);
-            } else if (keyCode == Keyboard.KeyCode.ESCAPE) {
-                Component.clearFocus();
+                menuBar.selectNextItem();
+                consumed = true;
             }
 
-            return false;
-        }
-
-        public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
-            return false;
+            return consumed;
         }
     };
 
@@ -69,16 +64,7 @@
         @Override
         public void windowClosed(Window window, Display display) {
             MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-            if (menuBarItem.isFocused()) {
-                Component.clearFocus();
-            } else {
-                repaintComponent();
-            }
-
-            MenuBar menuBar = menuBarItem.getMenuBar();
-            if (!menuBar.containsFocus()) {
-                menuBar.setActive(false);
-            }
+            menuBarItem.setSelected(false);
         }
     };
 
@@ -120,8 +106,8 @@
         MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
         MenuBar menuBar = menuBarItem.getMenuBar();
 
-        if (menuBar.isActive()) {
-            menuBarItem.requestFocus();
+        if (menuBar.getSelectedItem() != null) {
+            menuBarItem.setSelected(true);
         }
     }
 
@@ -130,7 +116,7 @@
         boolean consumed = super.mouseDown(component, button, x, y);
 
         MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-        menuBarItem.requestFocus();
+        menuBarItem.setSelected(true);
 
         return consumed;
     }
@@ -146,70 +132,19 @@
     }
 
     @Override
-    public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
-        boolean consumed = false;
-
-        MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-
-        if (keyCode == Keyboard.KeyCode.UP) {
-            menuPopup.requestFocus();
-            Component focusedComponent = Component.getFocusedComponent();
-            if (focusedComponent != null) {
-                focusedComponent.transferFocus(Direction.BACKWARD);
-            }
-
-            consumed = true;
-        } else if (keyCode == Keyboard.KeyCode.DOWN) {
-            menuPopup.requestFocus();
-            consumed = true;
-        } else if (keyCode == Keyboard.KeyCode.LEFT) {
-            menuBarItem.transferFocus(Direction.BACKWARD);
-            consumed = true;
-        } else if (keyCode == Keyboard.KeyCode.RIGHT) {
-            menuBarItem.transferFocus(Direction.FORWARD);
-            consumed = true;
-        } else if (keyCode == Keyboard.KeyCode.ENTER) {
-            menuBarItem.press();
-            consumed = true;
-        } else if (keyCode == Keyboard.KeyCode.ESCAPE) {
-            Component.clearFocus();
-            consumed = true;
-        } else {
-            consumed = super.keyPressed(component, keyCode, keyLocation);
-        }
-
-        return consumed;
-    }
-
-    @Override
-    public boolean keyReleased(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
-        boolean consumed = false;
-
-        MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-
-        if (keyCode == Keyboard.KeyCode.SPACE) {
-            menuBarItem.press();
-            consumed = true;
-        } else {
-            consumed = super.keyReleased(component, keyCode, keyLocation);
-        }
-
-        return consumed;
-    }
-
-    @Override
     public void enabledChanged(Component component) {
         super.enabledChanged(component);
 
         menuPopup.close();
     }
 
-    public void buttonPressed(Button button) {
-        if (menuPopup.isOpen()) {
-            menuPopup.close();
-        } else {
-            MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
+    @Override
+    public void stateChanged(Button button, Button.State previousState) {
+        super.stateChanged(button, previousState);
+
+        MenuBar.Item menuBarItem = (MenuBar.Item)button;
 
+        if (menuBarItem.isSelected()) {
             Display display = menuBarItem.getDisplay();
             Point menuBarItemLocation = menuBarItem.mapPointToAncestor(display, 0, getHeight());
 
@@ -217,6 +152,9 @@
 
             menuPopup.setLocation(menuBarItemLocation.x, menuBarItemLocation.y);
             menuPopup.open(menuBarItem);
+            menuPopup.requestFocus();
+        } else {
+            menuPopup.close();
         }
     }
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Tue Aug 11 18:00:50 2009
@@ -605,6 +605,9 @@
 
         @Override
         public void validate() {
+            // TODO Don't queue the validate callback until layout()? Then we
+            // wouldn't have to abort it in multiple locations...
+
             if (!isValid()) {
                 TextArea textArea = (TextArea)getComponent();
                 Container parent = textArea.getParent();

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java Tue Aug 11 18:00:50 2009
@@ -75,16 +75,15 @@
 
     public void paint(Graphics2D graphics) {
         MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-        MenuBar menuBar = menuBarItem.getMenuBar();
 
         int width = getWidth();
         int height = getHeight();
 
-        boolean highlight = menuPopup.isOpen()
-            || menuBarItem.isFocused();
+        boolean highlight = menuPopup.isOpen();
 
         // Paint highlight state
         if (highlight) {
+            MenuBar menuBar = menuBarItem.getMenuBar();
             Color highlightBackgroundColor = (Color)menuBar.getStyles().get("highlightBackgroundColor");
             graphics.setColor(highlightBackgroundColor);
             graphics.fillRect(0, 0, width, height);
@@ -102,12 +101,9 @@
     public boolean isOpaque() {
         boolean opaque = false;
 
-        MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
-        MenuBar menuBar = menuBarItem.getMenuBar();
-
-        boolean highlight = menuPopup.isOpen();
-
-        if (highlight) {
+        if (menuPopup.isOpen()) {
+            MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
+            MenuBar menuBar = menuBarItem.getMenuBar();
             Color highlightBackgroundColor = (Color)menuBar.getStyles().get("highlightBackgroundColor");
             opaque = (highlightBackgroundColor.getTransparency() == Transparency.OPAQUE);
         }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java Tue Aug 11 18:00:50 2009
@@ -28,7 +28,6 @@
 import org.apache.pivot.wtk.Theme;
 import org.apache.pivot.wtk.skin.ContainerSkin;
 
-
 /**
  * Menu bar skin.
  *
@@ -58,16 +57,12 @@
 
         MenuBar menuBar = (MenuBar)component;
         menuBar.getMenuBarListeners().add(this);
-
-        menuBar.setFocusTraversalPolicy(new IndexFocusTraversalPolicy(true));
     }
 
     public void uninstall() {
         MenuBar menuBar = (MenuBar)getComponent();
         menuBar.getMenuBarListeners().remove(this);
 
-        menuBar.setFocusTraversalPolicy(null);
-
         super.uninstall();
     }
 
@@ -298,8 +293,4 @@
     public void itemsRemoved(MenuBar menuBar, int index, Sequence<MenuBar.Item> removed) {
         invalidateComponent();
     }
-
-    public void activeChanged(MenuBar menuBar) {
-        // No-op
-    }
 }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java Tue Aug 11 18:00:50 2009
@@ -171,12 +171,10 @@
         boolean opaque = false;
 
         Menu.Item menuItem = (Menu.Item)getComponent();
-        Menu menu = menuItem.getSection().getMenu();
 
-        boolean highlight = (menuItem.isFocused()
-            || menuPopup.isOpen());
-
-        if (highlight) {
+        if (menuItem.isFocused()
+            || menuPopup.isOpen()) {
+            Menu menu = menuItem.getSection().getMenu();
             Color highlightBackgroundColor = (Color)menu.getStyles().get("highlightBackgroundColor");
             opaque = (highlightBackgroundColor.getTransparency() == Transparency.OPAQUE);
         }

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=803235&r1=803234&r2=803235&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 Tue Aug 11 18:00:50 2009
@@ -245,7 +245,11 @@
         // TODO Maybe we should leave this to the caller
         MenuPopup menuPopup = (MenuPopup)getComponent();
         Component affiliate = menuPopup.getAffiliate();
-        affiliate.getWindow().moveToFront();
+
+        Window affiliateWindow = affiliate.getWindow();
+        if (affiliateWindow.isOpen()) {
+            affiliateWindow.moveToFront();
+        }
     }
 
     public void menuChanged(MenuPopup menuPopup, Menu previousMenu) {

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Tue Aug 11 18:00:50 2009
@@ -23,7 +23,9 @@
 import org.apache.pivot.collections.Sequence;
 import org.apache.pivot.wtk.Component;
 import org.apache.pivot.wtk.Dimensions;
+import org.apache.pivot.wtk.Direction;
 import org.apache.pivot.wtk.GraphicsUtilities;
+import org.apache.pivot.wtk.Keyboard;
 import org.apache.pivot.wtk.Menu;
 import org.apache.pivot.wtk.MenuListener;
 import org.apache.pivot.wtk.Theme;
@@ -90,6 +92,11 @@
         super.uninstall();
     }
 
+    @Override
+    public boolean isFocusable() {
+        return true;
+    }
+
     public int getPreferredWidth(int height) {
         int preferredWidth = 0;
 
@@ -377,6 +384,23 @@
         invalidateComponent();
     }
 
+    @Override
+    public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
+        boolean consumed = super.keyPressed(component, keyCode, keyLocation);
+
+        Menu menu = (Menu)component;
+
+        if (keyCode == Keyboard.KeyCode.UP) {
+            menu.transferFocus(null, Direction.BACKWARD);
+            consumed = true;
+        } else if (keyCode == Keyboard.KeyCode.DOWN) {
+            menu.transferFocus(null, Direction.FORWARD);
+            consumed = true;
+        }
+
+        return consumed;
+    }
+
     public void sectionInserted(Menu menu, int index) {
         Menu.Section section = menu.getSections().get(index);
         section.getSectionListeners().add(this);

Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java?rev=803235&r1=803234&r2=803235&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java Tue Aug 11 18:00:50 2009
@@ -16,6 +16,8 @@
  */
 package org.apache.pivot.wtk.test;
 
+import java.awt.Color;
+
 import org.apache.pivot.collections.Map;
 import org.apache.pivot.wtk.Application;
 import org.apache.pivot.wtk.Component;
@@ -46,7 +48,7 @@
             }
         });
 
-        display.getStyles().put("backgroundColor", "#aaaaff");
+        display.getStyles().put("backgroundColor", new Color(0, 127, 127));
         window1.setContent(new Label("Hello Bar"));
         window1.open(display);