commit 13403613bc86a8ca769ea5c1cd2d94457e65f5c0
author rpechayr <rpechayr@59b500cc-1b3d-0410-9834-0bbf25fbcc57> Wed Mar 16 08:25:50 2011 +0000
committer rpechayr <rpechayr@59b500cc-1b3d-0410-9834-0bbf25fbcc57> Wed Mar 16 08:25:50 2011 +0000
tree 8660af8a2b514f9499edee08a15d8e620818cc5d
parent 10262e8bf1bf8c75008792496830a7a7598902b3

[iphone/ZxingWidget] widget now respects statusBarHidden or not instaed or always displaying it when controller is dismissed

git-svn-id: https://zxing.googlecode.com/svn/trunk@1726 59b500cc-1b3d-0410-9834-0bbf25fbcc57

iphone/ZXingWidget/Classes/ZXingWidgetController.h

diff --git a/iphone/ZXingWidget/Classes/ZXingWidgetController.h b/iphone/ZXingWidget/Classes/ZXingWidgetController.h
index a3e36c4..a721d6a 100755
--- a/iphone/ZXingWidget/Classes/ZXingWidgetController.h
+++ b/iphone/ZXingWidget/Classes/ZXingWidgetController.h
@@ -48,6 +48,7 @@
   AVCaptureVideoPreviewLayer *prevLayer;
 #endif
   BOOL decoding;
+  BOOL isStatusBarHidden;
 }
 
 #if HAS_AVFF

iphone/ZXingWidget/Classes/ZXingWidgetController.m

diff --git a/iphone/ZXingWidget/Classes/ZXingWidgetController.m b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
index 409055a..562a49b 100755
--- a/iphone/ZXingWidget/Classes/ZXingWidgetController.m
+++ b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
@@ -34,6 +34,7 @@
 
 @property BOOL showCancel;
 @property BOOL oneDMode;
+@property BOOL isStatusBarHidden;
 
 - (void)initCapture;
 - (void)stopCapture;
@@ -48,7 +49,7 @@
 #endif
 @synthesize result, delegate, soundToPlay;
 @synthesize overlayView;
-@synthesize oneDMode, showCancel;
+@synthesize oneDMode, showCancel, isStatusBarHidden;
 @synthesize readers;
 
 
@@ -87,7 +88,10 @@
 
 - (void)cancelled {
   [self stopCapture];
-  [[UIApplication sharedApplication] setStatusBarHidden:NO];
+  if (!self.isStatusBarHidden) {
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
+  }
+
   wasCancelled = YES;
   if (delegate != nil) {
     [delegate zxingControllerDidCancel:self];
@@ -124,7 +128,9 @@
 
 - (void)viewDidAppear:(BOOL)animated {
   [super viewDidAppear:animated];
-  [[UIApplication sharedApplication] setStatusBarHidden:YES];
+  self.isStatusBarHidden = [[UIApplication sharedApplication] isStatusBarHidden];
+  if (!isStatusBarHidden)
+    [[UIApplication sharedApplication] setStatusBarHidden:YES];
 
   decoding = YES;
 
@@ -137,7 +143,8 @@
 
 - (void)viewDidDisappear:(BOOL)animated {
   [super viewDidDisappear:animated];
-  [[UIApplication sharedApplication] setStatusBarHidden:NO];
+  if (!isStatusBarHidden)
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
   [self.overlayView removeFromSuperview];
   [self stopCapture];
 }
@@ -257,8 +264,9 @@
   decoder.delegate = nil;
 }
 
-- (void)alertDelegate:(id)text {        
-  [[UIApplication sharedApplication] setStatusBarHidden:NO];
+- (void)alertDelegate:(id)text {
+  if (!isStatusBarHidden)
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
   if (delegate != nil) {
     [delegate zxingController:self didScanResult:text];
   }