Skip to content

Only send ON_PERCENTAGE_CHANGED when value has changed #19556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2019
Merged

Only send ON_PERCENTAGE_CHANGED when value has changed #19556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f723537
Merge pull request #1 from cocos2d/v3
rh101 Mar 27, 2019
19a96bd
Only send the ON_PERCENTAGE_CHANGED if and only if the percentage val…
rh101 Mar 27, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions cocos/ui/UISlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,13 +455,24 @@ void Slider::setPercent(int percent)
{
percent = 0;
}
_percent = percent;
float res = 1.0 * percent / _maxPercent;

// Only send event if value has changed
if (_percent != percent)
{
_percent = percent;
updateVisualSlider();
percentChangedEvent(EventType::ON_PERCENTAGE_CHANGED);
}
}

void Slider::updateVisualSlider()
{
float res = 1.0 * _percent / _maxPercent;
float dis = _barLength * res;
_slidBallRenderer->setPosition(dis, _contentSize.height / 2.0f);
if (_scale9Enabled)
{
_progressBarRenderer->setPreferredSize(Size(dis,_contentSize.height));
_progressBarRenderer->setPreferredSize(Size(dis, _contentSize.height));
}
else
{
Expand Down Expand Up @@ -498,13 +509,11 @@ void Slider::onTouchMoved(Touch *touch, Event* /*unusedEvent*/)
{
_touchMovePosition = touch->getLocation();
setPercent(getPercentWithBallPos(_touchMovePosition));
percentChangedEvent(EventType::ON_PERCENTAGE_CHANGED);
}

void Slider::onTouchEnded(Touch *touch, Event *unusedEvent)
{
Widget::onTouchEnded(touch, unusedEvent);
percentChangedEvent(EventType::ON_PERCENTAGE_CHANGED);
percentChangedEvent(EventType::ON_SLIDEBALL_UP);
}

Expand Down Expand Up @@ -624,7 +633,7 @@ void Slider::barRendererScaleChangedWithSize()
}
}
_barRenderer->setPosition(_contentSize.width / 2.0f, _contentSize.height / 2.0f);
setPercent(_percent);
updateVisualSlider();
}

void Slider::progressBarRendererScaleChangedWithSize()
Expand Down Expand Up @@ -666,7 +675,7 @@ void Slider::progressBarRendererScaleChangedWithSize()
}
}
_progressBarRenderer->setPosition(0.0f, _contentSize.height / 2.0f);
setPercent(_percent);
updateVisualSlider();
}

void Slider::onPressStateChangedToNormal()
Expand Down
5 changes: 5 additions & 0 deletions cocos/ui/UISlider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ class CC_GUI_DLL Slider : public Widget
*/
void setPercent(int percent);

/**
* Updates the visual elements of the slider.
*/
void updateVisualSlider();

/**
* Gets the progress direction of slider.
*
Expand Down