sky/engine/core/painting/LayoutRoot.cpp - Issue 1178913003: Add support for text styles.

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: sky/engine/core/painting/LayoutRoot.cpp

Issue 1178913003: Add support for text styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Fix test per jackson's review Created 5 years, 6 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:

Index: sky/engine/core/painting/LayoutRoot.cpp

diff --git a/sky/engine/core/painting/LayoutRoot.cpp b/sky/engine/core/painting/LayoutRoot.cpp

index c3ab733308c9894a6717259b0c4ba7093562f1c2..c63acaa76d9e6278bcacc742cda8ad4a5d16d219 100644

--- a/sky/engine/core/painting/LayoutRoot.cpp

+++ b/sky/engine/core/painting/LayoutRoot.cpp

@@ -28,8 +28,10 @@ LayoutRoot::LayoutRoot()

, m_maxHeight(0)

{

m_settings = Settings::create();

- m_settings->setDefaultFixedFontSize(13);

- m_settings->setDefaultFontSize(16);

+ // Using 14px default to match Material Design English Body1:

+ // http://www.google.com/design/spec/style/typography.html#typography-typeface

+ m_settings->setDefaultFixedFontSize(14);

+ m_settings->setDefaultFontSize(14);

m_frameHost = FrameHost::createDummy(m_settings.get());

m_frame = LocalFrame::create(nullptr, m_frameHost.get());

m_frame->createView(IntSize(), Color::white, false);