Skip to content

Commit 4a5f308

Browse files
committed
Merge branch 'skia_2024'
2 parents 04618e3 + 7aa2c38 commit 4a5f308

File tree

10 files changed

+18
-25
lines changed

10 files changed

+18
-25
lines changed

docs/modules/ROOT/nav.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* xref:aspects.adoc[Design Aspects]
44
* xref:layout.adoc[Layout]
55
** xref:layout/limits.adoc[Limits]
6-
** xref:layout/size_elements.adoc[Size Elements]
7-
** xref:layout/stretch_elements.adoc[Stretch Elements]
6+
** xref:layout/sizing.adoc[Sizing]
7+
** xref:layout/stretch.adoc[Stretch]
88
** xref:layout/span.adoc[Span]
99
** xref:layout/scale.adoc[Scale]
10-
** xref:layout/align_elements.adoc[Align Elements]
11-
** xref:layout/margin_elements.adoc[Margin Elements]
10+
** xref:layout/alignment.adoc[Alignment]
11+
** xref:layout/margins.adoc[Margins]
1212
** xref:layout/floating.adoc[Floating]
1313
** xref:layout/tiles.adoc[Tiles]
1414
** xref:layout/grids.adoc[Grids]

docs/modules/ROOT/pages/common.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
:limits: xref:layout/limits.adoc[limits]
1919
:view_limits: xref:layout/limits.adoc#_view_limits[view_limits]
2020

21-
:Stretch-Elements: xref:layout/stretch_elements.adoc[Stretch Elements]
21+
:Stretch-Elements: xref:layout/stretch.adoc[Stretch]
2222
:Layers: xref:layout/layers.adoc[Layers]
2323
:Layers_Semantics: xref:layout/layers.adoc#_semantics[Layer Semantics]
2424
:decks: xref:layout/decks.adoc[Decks]

docs/modules/ROOT/pages/layout/align_elements.adoc docs/modules/ROOT/pages/layout/alignment.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Align Elements
1+
= Alignment
22

33
include::../common.adoc[]
44

docs/modules/ROOT/pages/layout/decks.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
== Decks
1+
= Decks
22

33
include::../common.adoc[]
44

docs/modules/ROOT/pages/layout/flow.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following graphic depicts a simplified layout scenario for child elements
1818
image::/layout/flow.svg[alt="flow", width=380px, role=center]
1919

2020
The child elements arranged in a `flow` composite are automatically re-flowed
21-
(re-lay-out) when the view size changes.
21+
when the view size changes.
2222

2323
== flow_composite
2424

docs/modules/ROOT/pages/layout/margin_elements.adoc docs/modules/ROOT/pages/layout/margins.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Margin Elements
1+
= Margins
22

33
include::../common.adoc[]
44

docs/modules/ROOT/pages/layout/size_elements.adoc docs/modules/ROOT/pages/layout/sizing.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
= Size Elements
2+
= Sizing
33

44
include::../common.adoc[]
55

docs/modules/ROOT/pages/layout/stretch_elements.adoc docs/modules/ROOT/pages/layout/stretch.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Stretch Elements
1+
= Stretch
22

33
include::../common.adoc[]
44

lib/include/elements/element/button.hpp

+6-13
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace cycfi::elements
3434
* \struct button_state
3535
*
3636
* \brief
37-
* A structure to maintain and manage the state of a button.
37+
* A struct for maintaining and managing the state of a button.
3838
*
3939
* This structure captures the various states that a button can have:
4040
* - `value`: The button's value; 0(off) or 1(on).
@@ -44,17 +44,10 @@ namespace cycfi::elements
4444
*/
4545
struct button_state
4646
{
47-
button_state()
48-
: value{false}
49-
, hilite{false}
50-
, tracking{false}
51-
, enabled{true}
52-
{}
53-
54-
bool value : 1;
55-
bool hilite : 1;
56-
bool tracking : 1;
57-
bool enabled : 1;
47+
bool value : 1 = false;
48+
bool hilite : 1 = false;
49+
bool tracking : 1 = false;
50+
bool enabled : 1 = true;
5851
};
5952

6053
/**
@@ -75,7 +68,7 @@ namespace cycfi::elements
7568
* plain buttons, radio buttons, slide switches, checkboxes, and more.
7669
*
7770
* The communication with the button styler is done via the
78-
* `receiver<button_state>` or a `receiver<int>` API. These APIs
71+
* `receiver<button_state>` or a `receiver<int>` APIs. These APIs
7972
* provide a means for the `basic_button` to update the button styler
8073
* about changes in button's state to allow the styler to adjust the
8174
* visual representation accordingly.

lib/include/elements/element/element.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ namespace cycfi::elements
137137
// Additional declarations
138138
////////////////////////////////////////////////////////////////////////////
139139

140-
// Type alisases
140+
// Type aliases
141141
using element_ptr = std::shared_ptr<element>;
142142
using element_const_ptr = std::shared_ptr<element const>;
143143
using weak_element_ptr = std::weak_ptr<element>;

0 commit comments

Comments
 (0)