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

Merge pull request #1279 from ThePickleMan/gles20 

min/max allowed value for CCControlSlider
This commit is contained in:
minggo 2012-09-04 19:17:36 -07:00
parent 45f95da30d 0a96915da2
commit d53c65e27b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,6 +149,7 @@ CCControlSlider* CCControlSlider::create(CCSprite * backgroundSprite, CCSprite*
void CCControlSlider::setMinimumValue(float minimumValue) void CCControlSlider::setMinimumValue(float minimumValue)
{ {
m_minimumValue=minimumValue; m_minimumValue=minimumValue;
m_minimumAllowedValue = minimumValue;
if (m_minimumValue >= m_maximumValue) if (m_minimumValue >= m_maximumValue)
m_maximumValue = m_minimumValue + 1.0f; m_maximumValue = m_minimumValue + 1.0f;
setValue(m_value); setValue(m_value);
@ -157,6 +158,7 @@ CCControlSlider* CCControlSlider::create(CCSprite * backgroundSprite, CCSprite*
void CCControlSlider::setMaximumValue(float maximumValue) void CCControlSlider::setMaximumValue(float maximumValue)
{ {
m_maximumValue=maximumValue; m_maximumValue=maximumValue;
m_maximumAllowedValue = maximumValue;
if (m_maximumValue <= m_minimumValue) if (m_maximumValue <= m_minimumValue)
m_minimumValue = m_maximumValue - 1.0f; m_minimumValue = m_maximumValue - 1.0f;
setValue(m_value); setValue(m_value);
@ -224,7 +226,7 @@ void CCControlSlider::sliderEnded(CCPoint location)
float CCControlSlider::valueForLocation(CCPoint location) float CCControlSlider::valueForLocation(CCPoint location)
{ {
float percent = (location.x-SLIDER_MARGIN_H)/ m_backgroundSprite->getContentSize().width; 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 NS_CC_EXT_END

4
extensions/GUI/CCControlExtension/CCControlSlider.h
View File

@ -55,6 +55,10 @@ class CCControlSlider: public CCControl
virtual void setMinimumValue(float val); virtual void setMinimumValue(float val);
CC_SYNTHESIZE_READONLY(float, m_maximumValue, MaximumValue); CC_SYNTHESIZE_READONLY(float, m_maximumValue, MaximumValue);
virtual void setMaximumValue(float val); virtual void setMaximumValue(float val);
CC_SYNTHESIZE(float, m_minimumAllowedValue, MinimumAllowedValue);
CC_SYNTHESIZE(float, m_maximumAllowedValue, MaximumAllowedValue);
//interval to snap to //interval to snap to
CC_SYNTHESIZE(float, m_snappingInterval, SnappingInterval); CC_SYNTHESIZE(float, m_snappingInterval, SnappingInterval);