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/06/23 02:58:12 UTC
svn commit: r787508 - in
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk: Sheet.java
skin/PushButtonSkin.java skin/terra/TerraPushButtonSkin.java
Author: gbrown
Date: Tue Jun 23 00:58:11 2009
New Revision: 787508
URL: http://svn.apache.org/viewvc?rev=787508&view=rev
Log:
Additional minor fixes.
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java?rev=787508&r1=787507&r2=787508&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java Tue Jun 23 00:58:11 2009
@@ -70,7 +70,7 @@
* The sheet's content component.
*/
public Sheet(Component content) {
- super(content, true);
+ super(content, false);
installSkin(Sheet.class);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java?rev=787508&r1=787507&r2=787508&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PushButtonSkin.java Tue Jun 23 00:58:11 2009
@@ -75,11 +75,6 @@
boolean consumed = super.mouseClick(component, button, x, y, count);
PushButton pushButton = (PushButton)getComponent();
-
- if (pushButton.isFocusable()) {
- pushButton.requestFocus();
- }
-
pushButton.press();
return consumed;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=787508&r1=787507&r2=787508&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Tue Jun 23 00:58:11 2009
@@ -30,6 +30,7 @@
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.skin.PushButtonSkin;
@@ -511,4 +512,14 @@
Component.clearFocus();
}
}
+
+ @Override
+ public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
+ if (!toolbar
+ && component.isFocusable()) {
+ component.requestFocus();
+ }
+
+ return super.mouseClick(component, button, x, y, count);
+ }
}