From 62c1a660407ec8f7589a271587ffee39bc215751 Mon Sep 17 00:00:00 2001
From: David Yeung <dayeung@chromium.org>
Date: Mon, 15 Dec 2025 19:00:09 -0800
Subject: [PATCH] Fix Multiline label height for glyphs w/ high ascenders and descenders

Label::GetBoundedTextSize calculated the text height solely based on the
baseline height. This ignored the actual visual height of the rendered
text, causing truncation for strings containing characters with large
ascenders or descenders.

This caused bugs with the DownloadBubble where filenames with special
characters were vertically cut off.

Fix is to use the maximum between the text's visual height and the
baseline height.

https://screenshot.googleplex.com/9DZJj79aNFGHccv

Ash pixel test label was also adjusted because of the change. No major
visual changes, just slight visual offset. Instead of triaging, ash
pixel tests require updating the revision number.

Fixed: 467442136
Change-Id: Id0a8b2e95353896e44800801fa508f4e17b7a3f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7256959
Reviewed-by: David Black <dmblack@google.com>
Reviewed-by: Keren Zhu <kerenzhu@chromium.org>
Reviewed-by: Andrew Xu <andrewxu@google.com>
Commit-Queue: David Black <dmblack@google.com>
Auto-Submit: David Yeung <dayeung@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1559108}
---

diff --git a/ash/clipboard/views/clipboard_history_item_view_pixeltest.cc b/ash/clipboard/views/clipboard_history_item_view_pixeltest.cc
index a59b475..0dcf831 100644
--- a/ash/clipboard/views/clipboard_history_item_view_pixeltest.cc
+++ b/ash/clipboard/views/clipboard_history_item_view_pixeltest.cc
@@ -63,14 +63,14 @@
           clipboard_history_util::kBitmapItemView);
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bitmap_item_view",
-      /*revision_number=*/1, bitmap_contents));
+      /*revision_number=*/2, bitmap_contents));
 
   // Press the tab key to focus on the delete button.
   GetEventGenerator()->PressAndReleaseKey(ui::VKEY_TAB, ui::EF_NONE);
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bitmap_item_view_with_delete_button",
-      /*revision_number=*/1, bitmap_contents));
+      /*revision_number=*/2, bitmap_contents));
 }
 
 }  // namespace ash
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 0c5bb34..2c1b9783 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -1422,8 +1422,9 @@
     size = full_text_->GetStringSize();
 
     if (base_line_height > 0) {
-      size.set_height(base::checked_cast<int>(GetRequiredLines()) *
-                      base_line_height);
+      const int min_total_height =
+          base::checked_cast<int>(GetRequiredLines()) * base_line_height;
+      size.set_height(std::max(size.height(), min_total_height));
     }
   }