views/controls/link.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

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: views/controls/link.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 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: views/controls/link.cc

===================================================================

--- views/controls/link.cc (revision 55911)

+++ views/controls/link.cc (working copy)

@@ -211,15 +211,15 @@

void Link::ValidateStyle() {

if (enabled_) {

- if (!(font().style() & gfx::Font::UNDERLINED)) {

+ if (!(font().GetStyle() & gfx::Font::UNDERLINED)) {

Label::SetFont(

- font().DeriveFont(0, font().style() | gfx::Font::UNDERLINED));

+ font().DeriveFont(0, font().GetStyle() | gfx::Font::UNDERLINED));

}

Label::SetColor(highlighted_ ? highlighted_color_ : normal_color_);

} else {

- if (font().style() & gfx::Font::UNDERLINED) {

+ if (font().GetStyle() & gfx::Font::UNDERLINED) {

Label::SetFont(

- font().DeriveFont(0, font().style() & ~gfx::Font::UNDERLINED));

+ font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED));

}

Label::SetColor(disabled_color_);

}

« no previous file with comments | « views/controls/label_unittest.cc ('k') | views/controls/listbox/native_listbox_win.cc » ('j') | no next file with comments »