Skip to content

Commit c4e528f

Browse files
committed
FC0a: ui/widgets/virtual_keyboard ports at 0.99371, on raea/feathers (bevy_feathers) and EditableText. raea/feathers carries feathers' dark theme (its palette, semantic colours, surface-level overrides and 150 token assignments, generated from dark_theme.rs and tokens.rs; with no UiTheme every token is FUCHSIA, as Bevy's empty ThemeProps), FeathersButton, VirtualKeyboard and ThemedText: a widget's font and text colour reach only a ThemedText, as feathers' Propagate is filtered With<ThemedText>, so the keyboard's plain Text keys keep Bevy's default font, as Bevy draws them. Feathers' own Fira Sans (four faces) and Fira Mono Medium are bundled whole in core/fonts, and its fonts name them by family. EditableText measures as TextInputMeasure (visible_lines of line height, rounded up; visible_width in ch, the advance of 0) and draws parley's caret, cursor_width of the font size wide, for the first half of each blink period while it has focus. Oklcha gains lighter, darker and with_alpha. 94 of 98 ported examples pass
1 parent 0032757 commit c4e528f

30 files changed

Lines changed: 1073 additions & 9 deletions

‎bench/bevy-parity/examples.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,4 @@ ui/widgets/headless_tabs
9797
ui/widgets/tab_navigation
9898
ui/widgets/viewport_node
9999
ui/widgets/vertical_slider
100+
ui/widgets/virtual_keyboard

‎bench/bevy-parity/runs.tsv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ ui/widgets/headless_tabs - 10
9696
ui/widgets/tab_navigation - 10
9797
ui/widgets/viewport_node - 10
9898
ui/widgets/vertical_slider - 10
99+
ui/widgets/virtual_keyboard - 10
61.9 KB
Binary file not shown.
140 KB
Binary file not shown.
132 KB
Binary file not shown.
150 KB
Binary file not shown.
141 KB
Binary file not shown.

‎core/fonts/fonts.feature‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
Feature: Bundled fonts for deterministic font aliasing
33
This folder holds the bundled fonts used for deterministic font aliasing (see
44
src/fonts.rs). They are Fontsource latin subsets
5-
(`packages/core/src/fonts/fontData.generated.ts`), extracted to woff2 files.
5+
(`packages/core/src/fonts/fontData.generated.ts`), extracted to woff2 files. Fira Sans (Regular, Bold, Italic,
6+
Bold Italic) and Fira Mono Medium are bevy_feathers 0.20.0's own files (src/assets/fonts), whole, as woff2: feathers'
7+
fonts::REGULAR and the rest, which raea/feathers names by family and weight.
68

79
Each family is licensed under the SIL Open Font License 1.1, and the license texts are in licenses/.
810

‎core/fonts/index.json‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,5 +292,40 @@
292292
"weight": "900",
293293
"style": "normal",
294294
"file": "poppins-900-normal.woff2"
295+
},
296+
{
297+
"package": "bevy_feathers",
298+
"family": "fira-sans",
299+
"weight": "400",
300+
"style": "normal",
301+
"file": "fira-sans-400-normal.woff2"
302+
},
303+
{
304+
"package": "bevy_feathers",
305+
"family": "fira-sans",
306+
"weight": "700",
307+
"style": "normal",
308+
"file": "fira-sans-700-normal.woff2"
309+
},
310+
{
311+
"package": "bevy_feathers",
312+
"family": "fira-sans",
313+
"weight": "400",
314+
"style": "italic",
315+
"file": "fira-sans-400-italic.woff2"
316+
},
317+
{
318+
"package": "bevy_feathers",
319+
"family": "fira-sans",
320+
"weight": "700",
321+
"style": "italic",
322+
"file": "fira-sans-700-italic.woff2"
323+
},
324+
{
325+
"package": "bevy_feathers",
326+
"family": "fira-mono",
327+
"weight": "500",
328+
"style": "normal",
329+
"file": "fira-mono-500-normal.woff2"
295330
}
296-
]
331+
]
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

0 commit comments

Comments
 (0)