You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by no...@apache.org on 2010/02/04 10:27:37 UTC
svn commit: r906415 -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
Author: noelgrandin
Date: Thu Feb 4 09:27:37 2010
New Revision: 906415
URL: http://svn.apache.org/viewvc?rev=906415&view=rev
Log:
PIVOT-373 Exception in Vertical Sliders
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSliderSkin.java
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=906415&r1=906414&r2=906415&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 Thu Feb 4 09:27:37 2010
@@ -147,12 +147,12 @@
sliderY = minY;
}
- int maxY = (sliderHeight) + dragOffset.y;
+ int maxY = (sliderHeight - thumbHeight) + dragOffset.y;
if (sliderY > maxY) {
sliderY = maxY;
}
- float ratio = (float)(sliderHeight - sliderY + dragOffset.y) / (sliderHeight - thumbHeight);
+ float ratio = (float)(sliderY - dragOffset.y) / (sliderHeight - thumbHeight);
int start = slider.getStart();
int end = slider.getEnd();
@@ -332,7 +332,8 @@
thumb.setLocation((int)((width - thumbWidth) * ratio), (height - thumbHeight) / 2);
} else {
thumb.setSize(thumbHeight, thumbWidth);
- thumb.setLocation((width - thumbHeight) / 2, (int)(height - ((height - thumbWidth) * ratio) - thumbWidth));
+
+ thumb.setLocation((width - thumbHeight) / 2, (int)((height - thumbWidth) * ratio));
}
}