| commit | e91eae91d6330a50d227d1629d00d599f189f3d8 | |
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | |
| Tue, 10 Dec 2013 22:18:42 +0000 (10 22:18 +0000) | ||
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | |
| Tue, 10 Dec 2013 22:18:42 +0000 (10 22:18 +0000) | ||
| tree | c0f2f75cd12edc5906779a52fccf1c38812cf997 | treesnapshot (tar.gz zip) |
| parent | bf9ed2c3a0080086f5458b7da164afb91c61e7d5 | commitdiff |
Add GetMinimumSize() for Labels and ensure it's zero for empty Links.
This requires auto-disabling focusability for empty links. I also reordered the
overrides for Link to match the View declaration order.
This also requires some major reworking of StyledLabel, which previously assumed
all Links had a focus border, and to make layout easier just forced space for a
focus border on all children at all times, as well as always reserving space
itself. I've changed this so StyledLabel lays out children correctly,
accounting for their focus borders, and only adds space for one itself if any
children have a focus border. This eliminates the need for
Label::SetHasFocusBorder(), which only had one non-StyledLabel caller (who
didn't need it).
BUG=none
TEST=none
R=sky@chromium.org
Review URL: https://codereview.chromium.org/111023004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239864 0039d316-1c4b-4281-b951-d872f2087c98
This requires auto-disabling focusability for empty links. I also reordered the
overrides for Link to match the View declaration order.
This also requires some major reworking of StyledLabel, which previously assumed
all Links had a focus border, and to make layout easier just forced space for a
focus border on all children at all times, as well as always reserving space
itself. I've changed this so StyledLabel lays out children correctly,
accounting for their focus borders, and only adds space for one itself if any
children have a focus border. This eliminates the need for
Label::SetHasFocusBorder(), which only had one non-StyledLabel caller (who
didn't need it).
BUG=none
TEST=none
R=sky@chromium.org
Review URL: https://codereview.chromium.org/111023004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239864 0039d316-1c4b-4281-b951-d872f2087c98