Skip to content

Commit 04618e3

Browse files
committed
Merge branch 'skia_2024'
2 parents 1e94605 + ee85a55 commit 04618e3

19 files changed

+2286
-2446
lines changed

docs/modules/ROOT/nav.adoc

+13
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,17 @@
22
* xref:setup.adoc[Setup and Installation]
33
* xref:aspects.adoc[Design Aspects]
44
* xref:layout.adoc[Layout]
5+
** xref:layout/limits.adoc[Limits]
6+
** xref:layout/size_elements.adoc[Size Elements]
7+
** xref:layout/stretch_elements.adoc[Stretch Elements]
8+
** xref:layout/span.adoc[Span]
9+
** xref:layout/scale.adoc[Scale]
10+
** xref:layout/align_elements.adoc[Align Elements]
11+
** xref:layout/margin_elements.adoc[Margin Elements]
12+
** xref:layout/floating.adoc[Floating]
13+
** xref:layout/tiles.adoc[Tiles]
14+
** xref:layout/grids.adoc[Grids]
15+
** xref:layout/layers.adoc[Layers]
16+
** xref:layout/decks.adoc[Decks]
17+
** xref:layout/flow.adoc[Flow]
518

docs/modules/ROOT/pages/aspects.adoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Step 4: Then finally, we place it in the `align_center_middle` element.
246246
TIP: If the element hierarchy gets a bit too deep, use the {cpp} `auto` to name
247247
sub-parts of the element composition to make it easier to understand.
248248

249-
The `layer` element is a composite element that holds zero or more `child'
249+
The `layer` element is a composite element that holds zero or more `child`
250250
elements. Some of you might have noticed that we already mentioned the
251251
`layer` element before when we were discussing the view’s content in the
252252
link:#app-and-window[App and Window] section: ``The content of the `view`
@@ -269,16 +269,16 @@ have dealt with in the previous sections.
269269
____
270270
271271
Take note that this example is only for illustrative purposes. The library
272-
provides easier ways to make sliders. Elements has a gallery a collection of
272+
provides easier ways to make sliders. Elements has a collection of pre-made,
273273
reusable element compositions, just like what we do here, but more refined.
274-
That gallery is constantly growing. Composing elements is fun!
274+
That collection is constantly growing. Composing elements is fun!
275275
276276
____
277277

278278
The `slider` has two parts: the `track` and the `thumb`. Here, we make a
279279
simple track using the same old box. We made it black. Then, we reused the
280-
same ``Dogs are my favorite people'' label for the thumb. The result looks
281-
silly, I should say :blush:, but hey, we are trying to make a point!
280+
same "Dogs are my favorite people" label for the thumb. The result looks
281+
silly, I should say, but hey, we are trying to make a point!
282282

283283
[source,cpp]
284284
----

docs/modules/ROOT/pages/common.adoc

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@
77
:warning-caption: ⚠️ {nbsp}WARNING
88

99
:aspects: * xref:aspects.adoc[Design Aspects]
10-
:layout: xref:layout.adoc[Layout]
1110

1211
:vst: https://en.wikipedia.org/wiki/Virtual_Studio_Technology[VST]
1312
:au: https://en.wikipedia.org/wiki/Audio_Units[AU]
1413
:gtk: https://www.gtk.org/[GTK]
1514
:pp: {plus}{plus}
1615
:mit_license: https://opensource.org/licenses/MIT[MIT License]
16+
17+
:layout: xref:layout.adoc[Layout]
18+
:limits: xref:layout/limits.adoc[limits]
19+
:view_limits: xref:layout/limits.adoc#_view_limits[view_limits]
20+
21+
:Stretch-Elements: xref:layout/stretch_elements.adoc[Stretch Elements]
22+
:Layers: xref:layout/layers.adoc[Layers]
23+
:Layers_Semantics: xref:layout/layers.adoc#_semantics[Layer Semantics]
24+
:decks: xref:layout/decks.adoc[Decks]

0 commit comments

Comments
 (0)