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/09/18 00:43:27 UTC
svn commit: r998359 - in /pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
wtk/src/org/apache/pivot/wtk/Component.java
Author: gbrown
Date: Fri Sep 17 22:43:27 2010
New Revision: 998359
URL: http://svn.apache.org/viewvc?rev=998359&view=rev
Log:
Various fixes.
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml?rev=998359&r1=998358&r2=998359&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/scroll_pane.bxml Fri Sep 17 22:43:27 2010
@@ -17,16 +17,16 @@ limitations under the License.
-->
<ScrollPane xmlns:bxml="http://pivot.apache.org/bxml"
- xmlns:navigation="org.apache.pivot.tutorials.explorer.navigation"
+ xmlns:explorer="org.apache.pivot.tutorials.explorer"
xmlns="org.apache.pivot.wtk">
<ImageView image="org/apache/pivot/tutorials/IMG_1147.jpg"
tooltipText="Pemaquid Point Lighthouse, Bristol ME"/>
<columnHeader>
- <navigation:Ruler orientation="horizontal"/>
+ <explorer:Ruler orientation="horizontal"/>
</columnHeader>
<rowHeader>
- <navigation:Ruler orientation="vertical"/>
+ <explorer:Ruler orientation="vertical"/>
</rowHeader>
</ScrollPane>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java?rev=998359&r1=998358&r2=998359&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java Fri Sep 17 22:43:27 2010
@@ -186,6 +186,8 @@ public class TerraSliderSkin extends Sli
public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
boolean consumed = super.mouseDown(component, button, x, y);
+ component.requestFocus();
+
if (button == Mouse.Button.LEFT) {
dragOffset = new Point(x, y);
Mouse.capture(component);
@@ -210,12 +212,6 @@ public class TerraSliderSkin extends Sli
return consumed;
}
- @Override
- public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
- component.requestFocus();
- return super.mouseClick(component, button, x, y, count);
- }
-
/**
* {@link KeyCode#LEFT LEFT} or {@link KeyCode#DOWN DOWN} Decrement
* the slider's value.<br>
@@ -258,7 +254,7 @@ public class TerraSliderSkin extends Sli
private Color buttonBorderColor;
private int thumbWidth;
private int thumbHeight;
- private Integer tickSpacing;
+ private int tickSpacing;
// Derived colors
private Color buttonBevelColor;
@@ -279,6 +275,8 @@ public class TerraSliderSkin extends Sli
thumbWidth = 8;
thumbHeight = 16;
+
+ tickSpacing = -1;
}
@Override
@@ -362,7 +360,7 @@ public class TerraSliderSkin extends Sli
RenderingHints.VALUE_ANTIALIAS_ON);
if (slider.getOrientation() == Orientation.HORIZONTAL) {
graphics.fillRect(0, (height - trackWidth) / 2, width, trackWidth);
- if (tickSpacing != null) {
+ if (tickSpacing != -1) {
int start = slider.getStart();
int end = slider.getEnd();
int value = start;
@@ -375,7 +373,7 @@ public class TerraSliderSkin extends Sli
}
} else {
graphics.fillRect((width - trackWidth) / 2, 0, trackWidth, height);
- if (tickSpacing != null) {
+ if (tickSpacing != -1) {
int start = slider.getStart();
int end = slider.getEnd();
int value = start;
@@ -428,6 +426,7 @@ public class TerraSliderSkin extends Sli
if (trackWidth < 0) {
throw new IllegalArgumentException("trackWidth is negative.");
}
+
this.trackWidth = trackWidth;
repaintComponent();
}
@@ -527,17 +526,21 @@ public class TerraSliderSkin extends Sli
setThumbHeight(thumbHeight.intValue());
}
- public Integer getTickSpacing() {
+ public int getTickSpacing() {
return tickSpacing;
}
- public void setTickSpacing(Integer tickSpacing) {
+ public void setTickSpacing(int tickSpacing) {
this.tickSpacing = tickSpacing;
repaintComponent();
}
public void setTickSpacing(Number tickSpacing) {
- setTickSpacing(tickSpacing == null ? null : tickSpacing.intValue());
+ if (tickSpacing == null) {
+ throw new IllegalArgumentException("tickSpacing is null.");
+ }
+
+ setTickSpacing(tickSpacing.intValue());
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=998359&r1=998358&r2=998359&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Fri Sep 17 22:43:27 2010
@@ -2727,6 +2727,8 @@ public abstract class Component implemen
protected void mouseOver() {
if (isEnabled()) {
+ mouseLocation = new Point(-1, -1);
+
componentMouseListeners.mouseOver(this);
}
}