AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #584 from igrechuhin/ig-fix

Browse source 
[ios] Fixed progress stuck.
This commit is contained in:
Vlad Mihaylenko 2015-11-19 12:14:16 +03:00
commit 83c4bec65d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm
View file

@ -24,6 +24,7 @@
- (void)reset
{
_progress = 0.;
[self.rootView updatePath:0.];
self.nextProgressToAnimate = nil;
}
@ -42,6 +43,7 @@
- (void)startSpinner
{
[self reset];
[self.rootView startSpinner];
}
@ -72,9 +74,12 @@
- (void)setProgress:(CGFloat)progress
{
if (progress <= _progress)
return;
if (self.rootView.animating)
{
self.nextProgressToAnimate = @(progress);
if (progress > self.nextProgressToAnimate.floatValue)
self.nextProgressToAnimate = @(progress);
}
else
{