Bug fix #36: iOS 6 Closebar not fully visible

mapsplugin · May 9, 2014 · e23d53b · e23d53b
1 parent 770542e
commit e23d53b
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/ios/GoogleMaps/GoogleMaps.m b/src/ios/GoogleMaps/GoogleMaps.m
@@ -330,9 +330,9 @@ - (void)showDialog:(CDVInvokedUrlCommand *)command {
 
 
   int footerHeight = 40;
-  int headerHeight = 0;
+  int footerAdjustment = 0;
   if ([PluginUtil isIOS7] == false) {
-    headerHeight = 20;
+    footerAdjustment = 20;
   }
 
   // Calculate the full screen size
@@ -344,26 +344,24 @@ - (void)showDialog:(CDVInvokedUrlCommand *)command {
   if (direction == UIInterfaceOrientationLandscapeLeft ||
     direction == UIInterfaceOrientationLandscapeRight) {
     pluginRect.size.width = screenSize.size.height;
-    pluginRect.size.height = screenSize.size.width - footerHeight - headerHeight;
+    pluginRect.size.height = screenSize.size.width - footerHeight - footerAdjustment;
   } else {
     pluginRect.size.width = screenSize.size.width;
-    pluginRect.size.height = screenSize.size.height - footerHeight - headerHeight;
+    pluginRect.size.height = screenSize.size.height - footerHeight;
   }
   [self.mapCtrl.view setFrame:pluginRect];
 
   //self.mapCtrl.view.frame = pluginRect;
-  [self.footer setFrameWithInt:0 top:pluginRect.size.height width:pluginRect.size.width height:footerHeight];
+  [self.footer setFrameWithInt:0 top:pluginRect.size.height - footerAdjustment width:pluginRect.size.width height:footerHeight];
   [self.licenseButton setFrameWithInt:pluginRect.size.width - 110 top:0 width:100 height:footerHeight];
   [self.closeButton setFrameWithInt:10 top:0 width:50 height:footerHeight];
 
-  // Add the footer
-  [self.webView addSubview:self.footer];
-
   // Show the map
   [self.webView addSubview:self.mapCtrl.view];
 
-  [self.mapCtrl updateMapViewLayout];
-
+  // Add the footer
+  [self.webView addSubview:self.footer];
+
   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];