[Dialogs] Fix incorrect content height for non-standard dialogs (mate…

…rial-components#9864) Fixing content height calculations, to use the remaining space after actions and title were removed. This corrected small height misalignment for alerts without title or extra long alerts. PiperOrigin-RevId: 299924535
Shilpriya-Simform · Mar 11, 2020 · ba30b6f · ba30b6f
1 parent a10704d
commit ba30b6f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/components/Dialogs/src/private/MDCAlertControllerView+Private.m b/components/Dialogs/src/private/MDCAlertControllerView+Private.m
@@ -709,9 +709,8 @@ - (void)layoutSubviews {
       CGFloat maxActionsHeight = CGRectGetHeight(self.bounds) / 2.0f;
       actionsScrollViewRect.size.height = MIN(maxActionsHeight, actionsScrollViewRect.size.height);
     }
-    contentScrollViewRect.size.height = CGRectGetHeight(self.bounds) -
-                                        actionsScrollViewRect.size.height -
-                                        contentScrollViewRect.origin.y;
+    contentScrollViewRect.size.height =
+        actionsScrollViewRect.origin.y - contentScrollViewRect.origin.y;
 
     self.messageLabel.accessibilityFrame = UIAccessibilityConvertFrameToScreenCoordinates(
         CGRectMake(messageFrame.origin.x, contentScrollViewRect.origin.y, messageFrame.size.width,

diff --git a/...rConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png b/...rConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png
diff --git a/...CAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png b/...CAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png
diff --git a/...dens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png b/...dens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png
diff --git a/...AlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png b/...AlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png
diff --git a/...ens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png b/...ens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png