ui/views/controls/label.cc - Issue 1894383002: MacViews: Implement Full Keyboard Access.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/label.cc

Issue 1894383002: MacViews: Implement Full Keyboard Access. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SetFocusBehavior

Patch Set: Address review comments. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/views/controls/label.cc

diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc

index bf26f1e8be52fb18a1bcea5a9a7f075042561181..b75e34c87631380cf5a172531dd5a5d1bf06f49d 100644

--- a/ui/views/controls/label.cc

+++ b/ui/views/controls/label.cc

@@ -213,7 +213,7 @@ base::string16 Label::GetDisplayTextForTesting() {

gfx::Insets Label::GetInsets() const {

gfx::Insets insets = View::GetInsets();

- if (focus_behavior() == FocusBehavior::ALWAYS) {

+ if (focus_behavior() != FocusBehavior::NEVER) {

insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,

kFocusBorderPadding, kFocusBorderPadding);

}

@@ -435,7 +435,7 @@ void Label::MaybeBuildRenderTextLines() {

return;

gfx::Rect rect = GetContentsBounds();

- if (focus_behavior() == FocusBehavior::ALWAYS)

+ if (focus_behavior() != FocusBehavior::NEVER)

rect.Inset(kFocusBorderPadding, kFocusBorderPadding);

if (rect.IsEmpty())

return;

« ui/views/controls/button/button.cc ('K') | « ui/views/controls/combobox/combobox.cc ('k') | ui/views/controls/link.h » ('j') | ui/views/focus/focus_manager.h » ('J')