mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move widget cancel button subview from drawRect to init. Remove image stuff that's not being used.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2456 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-10-14 00:29:07 +00:00
parent 1f0ac619b0
commit 5c0aef5357
2 changed files with 27 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/ZXingWidget/Classes/OverlayView.h
View file

@ -19,7 +19,6 @@
@protocol CancelDelegate; @protocol CancelDelegate;
@interface OverlayView : UIView { @interface OverlayView : UIView {
UIImageView *imageView;
NSMutableArray *_points; NSMutableArray *_points;
UIButton *cancelButton; UIButton *cancelButton;
UILabel *instructionsLabel; UILabel *instructionsLabel;

86
iphone/ZXingWidget/Classes/OverlayView.m
View file

@ -72,6 +72,18 @@ static const CGFloat kLicenseButtonPadding = 10;
[self addSubview:licenseButton]; [self addSubview:licenseButton];
} }
self.cancelEnabled = isCancelEnabled; self.cancelEnabled = isCancelEnabled;
if (self.cancelEnabled) {
UIButton *butt = [UIButton buttonWithType:UIButtonTypeRoundedRect];
self.cancelButton = butt;
if ([self.cancelButtonTitle length] > 0 ) {
[cancelButton setTitle:self.cancelButtonTitle forState:UIControlStateNormal];
} else {
[cancelButton setTitle:NSLocalizedStringWithDefaultValue(@"OverlayView cancel button title", nil, [NSBundle mainBundle], @"Cancel", @"Cancel") forState:UIControlStateNormal];
}
[cancelButton addTarget:self action:@selector(cancel:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:cancelButton];
}
} }
return self; return self;
} }
@ -102,7 +114,6 @@ static const CGFloat kLicenseButtonPadding = 10;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
- (void) dealloc { - (void) dealloc {
[imageView release];
[_points release]; [_points release];
[instructionsLabel release]; [instructionsLabel release];
[displayedMessage release]; [displayedMessage release];
@ -161,10 +172,6 @@ static const CGFloat kLicenseButtonPadding = 10;
} }
CGContextRef c = UIGraphicsGetCurrentContext(); CGContextRef c = UIGraphicsGetCurrentContext();
if (nil != _points) {
// [imageView.image drawAtPoint:cropRect.origin];
}
CGFloat white[4] = {1.0f, 1.0f, 1.0f, 1.0f}; CGFloat white[4] = {1.0f, 1.0f, 1.0f, 1.0f};
CGContextSetStrokeColor(c, white); CGContextSetStrokeColor(c, white);
CGContextSetFillColor(c, white); CGContextSetFillColor(c, white);
@ -225,60 +232,6 @@ static const CGFloat kLicenseButtonPadding = 10;
} }
} }
} }
if (self.cancelEnabled) {
UIButton *butt = [UIButton buttonWithType:UIButtonTypeRoundedRect];
self.cancelButton = butt;
if ([self.cancelButtonTitle length] > 0 ) {
[cancelButton setTitle:self.cancelButtonTitle forState:UIControlStateNormal];
} else {
[cancelButton setTitle:NSLocalizedStringWithDefaultValue(@"OverlayView cancel button title", nil, [NSBundle mainBundle], @"Cancel", @"Cancel") forState:UIControlStateNormal];
}
if (oneDMode) {
[cancelButton setTransform:CGAffineTransformMakeRotation(M_PI/2)];
[cancelButton setFrame:CGRectMake(20, 175, 45, 130)];
}
else {
CGSize theSize = CGSizeMake(100, 50);
CGRect theRect = CGRectMake((rect.size.width - theSize.width) / 2, cropRect.origin.y + cropRect.size.height + 20, theSize.width, theSize.height);
[cancelButton setFrame:theRect];
}
[cancelButton addTarget:self action:@selector(cancel:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:cancelButton];
[self addSubview:imageView];
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
/*
- (void) setImage:(UIImage*)image {
//if( nil == imageView ) {
// imageView = [[UIImageView alloc] initWithImage:image];
// imageView.alpha = 0.5;
// } else {
imageView.image = image;
//}
//CGRect frame = imageView.frame;
//frame.origin.x = self.cropRect.origin.x;
//frame.origin.y = self.cropRect.origin.y;
//imageView.frame = CGRectMake(0,0, 30, 50);
//[_points release];
//_points = nil;
//self.backgroundColor = [UIColor clearColor];
//[self setNeedsDisplay];
}
*/
////////////////////////////////////////////////////////////////////////////////////////////////////
- (UIImage*) image {
return imageView.image;
} }
@ -306,4 +259,19 @@ static const CGFloat kLicenseButtonPadding = 10;
} }
- (void)layoutSubviews {
[super layoutSubviews];
if (cancelButton) {
if (oneDMode) {
[cancelButton setTransform:CGAffineTransformMakeRotation(M_PI/2)];
[cancelButton setFrame:CGRectMake(20, 175, 45, 130)];
} else {
CGSize theSize = CGSizeMake(100, 50);
CGRect rect = self.frame;
CGRect theRect = CGRectMake((rect.size.width - theSize.width) / 2, cropRect.origin.y + cropRect.size.height + 20, theSize.width, theSize.height);
[cancelButton setFrame:theRect];
}
}
}
@end @end