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 2010/11/29 20:30:43 UTC
svn commit: r1040238 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/issues/pivot_628.bxml
tutorials/src/org/apache/pivot/tutorials/menus/shape_square_add.png
wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
Author: gbrown
Date: Mon Nov 29 19:30:42 2010
New Revision: 1040238
URL: http://svn.apache.org/viewvc?rev=1040238&view=rev
Log:
Fix some minor bugs in MenuButtonSkin.
Removed:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/shape_square_add.png
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_628.bxml
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_628.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_628.bxml?rev=1040238&r1=1040237&r2=1040238&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_628.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_628.bxml Mon Nov 29 19:30:42 2010
@@ -16,7 +16,7 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="Value Tag Test" maximized="true"
+<Window title="Null Attribute Test" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns="org.apache.pivot.wtk">
<windowStateListeners>
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=1040238&r1=1040237&r2=1040238&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Mon Nov 29 19:30:42 2010
@@ -58,6 +58,9 @@ public abstract class MenuButtonSkin ext
&& !componentWindow.isClosing()) {
componentWindow.moveToFront();
}
+
+ pressed = false;
+ repaintComponent();
}
};
@@ -127,23 +130,6 @@ public abstract class MenuButtonSkin ext
menuPopup.close();
}
- @Override
- public void focusedChanged(Component component, Component obverseComponent) {
- super.focusedChanged(component, obverseComponent);
-
- repaintComponent();
-
- // Close the popup if focus was transferred to a component whose
- // window is not the popup
- if (!component.isFocused()) {
- pressed = false;
-
- if (!menuPopup.containsFocus()) {
- menuPopup.close();
- }
- }
- }
-
// Component mouse events
@Override
public void mouseOut(Component component) {