Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update extensions/GUI/CCControlExtension/CCControlSlider.cpp 

Added minimum/maximum allowed values
This commit is contained in:
ThePickleMan 2012-09-02 16:10:25 -05:00
parent 82ea6fbb99
commit e07320f6a8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/GUI/CCControlExtension/CCControlSlider.cpp
View File

@ -162,6 +162,16 @@ CCControlSlider* CCControlSlider::create(CCSprite * backgroundSprite, CCSprite*
setValue(m_value);
}
void CCControlSlider::setMinimumAllowedValue(float minimumAllowedValue)
{
m_minimumAllowedValue = minimumAllowedValue;
}
void CCControlSlider::setMaximumAllowedValue(float maximumAllowedValue)
{
m_maximumAllowedValue = maximumAllowedValue;
}
//this is the same as CCControl::getTouchLocation, but it returns the position relative to the position of this control
CCPoint CCControlSlider::getTouchLocationInControl(CCTouch* touch)
{
@ -224,7 +234,7 @@ void CCControlSlider::sliderEnded(CCPoint location)
float CCControlSlider::valueForLocation(CCPoint location)
{
float percent = (location.x-SLIDER_MARGIN_H)/ m_backgroundSprite->getContentSize().width;
return m_minimumValue + percent * (m_maximumValue - m_minimumValue);
return max(min(m_minimumValue + percent * (m_maximumValue - m_minimumValue), m_maximumAllowedValue), m_minimumAllowedValue);
}
NS_CC_EXT_END