react-native-gizwits-scroll-ruler 1.0.15 → 1.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -453,7 +453,7 @@
|
|
|
453
453
|
-(void)setRealValue:(int)realValue animated:(BOOL)animated{
|
|
454
454
|
_realValue = realValue;
|
|
455
455
|
float totalValue = _realValue*_step +_minValue;
|
|
456
|
-
|
|
456
|
+
[self setValueToValueLabel:totalValue];
|
|
457
457
|
[_collectionView setContentOffset:CGPointMake(_realValue*RulerGap, 0) animated:animated];
|
|
458
458
|
}
|
|
459
459
|
|
|
@@ -461,6 +461,15 @@
|
|
|
461
461
|
return 30+20+CollectionHeight;
|
|
462
462
|
}
|
|
463
463
|
|
|
464
|
+
-(void)setValueToValueLabel:(float)value{
|
|
465
|
+
if(_step < 1.0){
|
|
466
|
+
_valueLab.text = [NSString stringWithFormat:@"%.1f",value];
|
|
467
|
+
} else{
|
|
468
|
+
_valueLab.text = [NSString stringWithFormat:@"%d",(int)roundf(value)];
|
|
469
|
+
}
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
|
|
464
473
|
#pragma mark UICollectionViewDataSource & Delegate
|
|
465
474
|
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
|
|
466
475
|
{
|
|
@@ -532,24 +541,24 @@
|
|
|
532
541
|
|
|
533
542
|
#pragma mark -UIScrollViewDelegate
|
|
534
543
|
-(void)scrollViewDidScroll:(UIScrollView *)scrollView{
|
|
535
|
-
int value = scrollView.contentOffset.x/RulerGap;
|
|
536
|
-
float totalValue = value*_step +_minValue;
|
|
537
|
-
|
|
538
|
-
if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollRulerView:valueChange:)]) {
|
|
539
|
-
[self.delegate dyScrollRulerView:self valueChange:totalValue];
|
|
540
|
-
}
|
|
541
544
|
|
|
542
545
|
if (_scrollByHand) {
|
|
546
|
+
int value = scrollView.contentOffset.x/RulerGap;
|
|
547
|
+
float totalValue = value*_step +_minValue;
|
|
548
|
+
|
|
549
|
+
if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollRulerView:valueChange:)]) {
|
|
550
|
+
[self.delegate dyScrollRulerView:self valueChange:totalValue];
|
|
551
|
+
}
|
|
543
552
|
if (totalValue >= _maxValue) {
|
|
544
|
-
|
|
553
|
+
[self setValueToValueLabel:(float)_maxValue];
|
|
545
554
|
}else if(totalValue <= _minValue){
|
|
546
555
|
if(_minValue == 0) {
|
|
547
|
-
|
|
556
|
+
[self setValueToValueLabel:0.0];
|
|
548
557
|
} else {
|
|
549
|
-
|
|
558
|
+
[self setValueToValueLabel:(float)_minValue];
|
|
550
559
|
}
|
|
551
560
|
}else{
|
|
552
|
-
|
|
561
|
+
[self setValueToValueLabel:(value*_step) +_minValue];
|
|
553
562
|
}
|
|
554
563
|
}
|
|
555
564
|
}
|