From ba30b6ffe870cf993ae19b0cb7efa43ee21130c3 Mon Sep 17 00:00:00 2001 From: Galia Kaufman Date: Wed, 11 Mar 2020 07:49:08 -0400 Subject: [PATCH] [Dialogs] Fix incorrect content height for non-standard dialogs (#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 --- .../Dialogs/src/private/MDCAlertControllerView+Private.m | 5 ++--- ...estAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png | 4 ++-- .../testAlertHasTitleIconAndMessage_11_2@2x.png | 4 ++-- .../testAlertHasTitleIcon_11_2@2x.png | 4 ++-- .../testAlertHasTitleImageAndMessage_11_2@2x.png | 4 ++-- .../testAlertHasTitleImage_11_2@2x.png | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/components/Dialogs/src/private/MDCAlertControllerView+Private.m b/components/Dialogs/src/private/MDCAlertControllerView+Private.m index 5e1c38eccda..dc3df69c510 100644 --- 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/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png index 1d9f6224e2c..7da59ea0a54 100644 --- a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png +++ b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleAndTitleImageAndAccessoryView_11_2@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfe8651ee85bf7bd14c7620dd21fa452a3d3b7f05852f5b99ef9e860a03bc4f0 -size 22620 +oid sha256:3f2116a224bc75b632194c5eb6a83f3eb2cae66cb19101422be9438b2e20bd39 +size 24876 diff --git a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png index d09e9c57bc4..9e0ba703e01 100644 --- a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png +++ b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIconAndMessage_11_2@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:064f09c6231c877ff3505f7bf0eafafd707d12cf5bd1a527c5b929c338768e16 -size 8110 +oid sha256:4da5774bc9114a2f288b2eda177722def7a428cae33f15d633a99f8f7b34978d +size 12386 diff --git a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png index 1481487d16a..3f73f473712 100644 --- a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png +++ b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleIcon_11_2@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b960191432fa6348e957ce11ce572a81ef935c0318ba364539b717bbd21c8321 -size 3931 +oid sha256:23962845cd873934391f85d57c66f39dbc78f6b32b21a941c36d001fc8eedd15 +size 4187 diff --git a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png index 108e98c17d5..62ed62a49d0 100644 --- a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png +++ b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImageAndMessage_11_2@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10c0a2b90e700d5f49722569c297c3133a8db47646149753519d5923715c4a25 -size 47888 +oid sha256:21590962f9541573c6debdd3e0f5f569eb098515f161a37618c64a7a574bbafd +size 52449 diff --git a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png index 737d18cca24..81d8e1dd520 100644 --- a/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png +++ b/snapshot_test_goldens/goldens_64/MDCAlertControllerConfigurationsTests/testAlertHasTitleImage_11_2@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded96de31c90c5dcfd137c96e17c8f71df0d0535b5a5a0a57e5e18512593df8a -size 6329 +oid sha256:c8f1a67be9176eab616d2d6743fca1dfa3a525a3b93c46765e6b4bbad4a36a94 +size 6656