diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 04:04:26 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 04:04:26 +0000 |
| commit | 91d4883b1f0082cc434f764531be11768d8d7a4d (patch) | |
| tree | 359ea3b1d3a63ca82144d504a32c8563c8858d6f | |
| parent | a49ee0c8a62bb3cfeefa5a34fe32d14287727cb1 (diff) | |
| download | chromium_src-91d4883b1f0082cc434f764531be11768d8d7a4d.zip chromium_src-91d4883b1f0082cc434f764531be11768d8d7a4d.tar.gz chromium_src-91d4883b1f0082cc434f764531be11768d8d7a4d.tar.bz2 | |
Merge 241922 "History: Prevent time text from being ellipsized a..."
> History: Prevent time text from being ellipsized at some zoom levels.
>
> BUG=329779
> TEST=Open a fresh profile, and visit a single page. Open chrome://history
> and ensure that there is only a single history entry. Now use Ctrl+ to zoom
> the page. Ensure the the visit time is never ellipsized, even at high zoom
> levels.
>
> Review URL: https://codereview.chromium.org/99583012
TBR=dubroy@chromium.org
Review URL: https://codereview.chromium.org/165913002
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@251251 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/history/history.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js index 95c3ab2..4002ba4 100644 --- a/chrome/browser/resources/history/history.js +++ b/chrome/browser/resources/history/history.js @@ -1366,7 +1366,10 @@ HistoryView.prototype.setTimeColumnWidth_ = function() { el.style.minWidth = '-webkit-min-content'; var width = el.clientWidth; el.style.minWidth = ''; - return width; + + // Add an extra pixel to prevent rounding errors from causing the text to + // be ellipsized at certain zoom levels (see crbug.com/329779). + return width + 1; }); var maxWidth = widths.length ? Math.max.apply(null, widths) : 0; |