diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 07:55:51 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 07:55:51 +0000 |
| commit | b183dd1ebe23ff7816cc7e7a8f98a59d4f9a73fa (patch) | |
| tree | ed54915018e768dbd7a77475e3ad7774d9322a76 /ash/sticky_keys | |
| parent | b50715c5b5ed5b899a8276709de43f1a5716eded (diff) | |
| download | chromium_src-b183dd1ebe23ff7816cc7e7a8f98a59d4f9a73fa.zip chromium_src-b183dd1ebe23ff7816cc7e7a8f98a59d4f9a73fa.tar.gz chromium_src-b183dd1ebe23ff7816cc7e7a8f98a59d4f9a73fa.tar.bz2 | |
Prepare to use gfx::RenderText in views::Label.
Alter Label's API to support a RenderText implementation.
This has minimal functional changes to Label for now.
The Label rewrite to use RenderText will land separately.
Remove the generally unused Label::SetDirectionalityMode.
We should always use the text's directionality anyway.
(it seems like this was the case even for *FROM_UI...)
Also remove views::LabelButton::SetDirectionalityMode.
Fix LabelButton mutli-line preferred sizing and layout.
Add RenderText flag to swap newline chars for symbols.
(We don't want that for multi-line views::Label layout)
Add GetCurrentHorizontalAlignment ALIGN_HEAD helper.
Expose ElideBehavior and ShadowValues accessors.
Set the styles of the argument FontList in SetFontList.
(this is how Label transmits style information for now)
Fix partial-pixel treatment for centered alignment.
Update Message Center's InnerBoundedLabel Label subclass.
(minimal changes to keep it working with older paint path)
BUG=240037
TEST=Negligible appearance changes (better multi-line label centering).
R=sky@chromium.org,asvitkine@chromium.org
Review URL: https://codereview.chromium.org/23228004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/sticky_keys')
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc index c68f227..5b239f7 100644 --- a/ash/sticky_keys/sticky_keys_overlay.cc +++ b/ash/sticky_keys/sticky_keys_overlay.cc @@ -70,7 +70,7 @@ StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name) SetFocusable(false); SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF)); SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF)); - set_subpixel_rendering_enabled(false); + SetSubpixelRenderingEnabled(false); } StickyKeyOverlayLabel::~StickyKeyOverlayLabel() { |