Skip to content

Commit a91be7c

Browse files
djoweldjowel
committed
Merge branch 'skia_2024'
2 parents 7ed797b + 6a1797c commit a91be7c

32 files changed

+240
-170
lines changed

‎lib/CMakeLists.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ set(ELEMENTS_SOURCES
2020
src/element/element.cpp
2121
src/element/floating.cpp
2222
src/element/flow.cpp
23-
src/element/gallery/button.cpp
24-
src/element/gallery/check_box.cpp
25-
src/element/gallery/icon_button.cpp
26-
src/element/gallery/menu.cpp
27-
src/element/gallery/radio_button.cpp
28-
src/element/gallery/slide_switch.cpp
29-
src/element/gallery/thumbwheel.cpp
23+
src/element/style/button.cpp
24+
src/element/style/check_box.cpp
25+
src/element/style/icon_button.cpp
26+
src/element/style/menu.cpp
27+
src/element/style/radio_button.cpp
28+
src/element/style/slide_switch.cpp
29+
src/element/style/thumbwheel.cpp
3030
src/element/grid.cpp
3131
src/element/image.cpp
3232
src/element/label.cpp
@@ -73,21 +73,21 @@ set(ELEMENTS_HEADERS
7373
include/elements/element/element.hpp
7474
include/elements/element/floating.hpp
7575
include/elements/element/flow.hpp
76-
include/elements/element/gallery.hpp
77-
include/elements/element/gallery/button.hpp
78-
include/elements/element/gallery/caption.hpp
79-
include/elements/element/gallery/check_box.hpp
80-
include/elements/element/gallery/thumbwheel.hpp
81-
include/elements/element/gallery/dialog.hpp
82-
include/elements/element/gallery/group.hpp
83-
include/elements/element/gallery/icon_button.hpp
84-
include/elements/element/gallery/menu.hpp
85-
include/elements/element/gallery/message_box.hpp
86-
include/elements/element/gallery/notebook.hpp
87-
include/elements/element/gallery/pane.hpp
88-
include/elements/element/gallery/radio_button.hpp
89-
include/elements/element/gallery/tab.hpp
90-
include/elements/element/gallery/text_entry.hpp
76+
include/elements/element/style.hpp
77+
include/elements/element/style/button.hpp
78+
include/elements/element/style/caption.hpp
79+
include/elements/element/style/check_box.hpp
80+
include/elements/element/style/thumbwheel.hpp
81+
include/elements/element/style/dialog.hpp
82+
include/elements/element/style/group.hpp
83+
include/elements/element/style/icon_button.hpp
84+
include/elements/element/style/menu.hpp
85+
include/elements/element/style/message_box.hpp
86+
include/elements/element/style/notebook.hpp
87+
include/elements/element/style/pane.hpp
88+
include/elements/element/style/radio_button.hpp
89+
include/elements/element/style/tab.hpp
90+
include/elements/element/style/text_entry.hpp
9191
include/elements/element/grid.hpp
9292
include/elements/element/image.hpp
9393
include/elements/element/indirect.hpp

‎lib/include/elements/element.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
#include <elements/element/tooltip.hpp>
3737

3838
// Include this last
39-
#include <elements/element/gallery.hpp>
39+
#include <elements/element/style.hpp>
4040

4141
#endif

‎lib/include/elements/element/align.hpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace cycfi::elements
6868
* A template class to handle horizontal alignment for elements.
6969
*
7070
* \tparam
71-
* Subject Base type, must meet the `concepts::Element` concept,.
71+
* Subject Base type, must meet the `Element` concept.
7272
*/
7373
template <concepts::Element Subject>
7474
class halign_element : public proxy<Subject, align_element_base>
@@ -88,7 +88,7 @@ namespace cycfi::elements
8888
* Aligns the enclosed element (subject) in the x-axis.
8989
*
9090
* \tparam Subject
91-
* The subject type, must meet the `concepts::Element` concept.
91+
* The subject type, must meet the `Element` concept.
9292
*
9393
* \param align
9494
* The alignment value from 0.0 (left) to 1.0 (right).
@@ -111,7 +111,7 @@ namespace cycfi::elements
111111
* Left-aligns the enclosed element (subject).
112112
*
113113
* \tparam Subject
114-
* The subject type, must meet the `concepts::Element` concept.
114+
* The subject type, must meet the `Element` concept.
115115
*
116116
* \param subject
117117
* The subject to be aligned.
@@ -131,7 +131,7 @@ namespace cycfi::elements
131131
* Center-aligns the enclosed element (subject).
132132
*
133133
* \tparam Subject
134-
* The subject type, must meet the `concepts::Element` concept.
134+
* The subject type, must meet the `Element` concept.
135135
*
136136
* \param subject
137137
* The subject to be aligned.
@@ -151,7 +151,7 @@ namespace cycfi::elements
151151
* Right-aligns the enclosed element (subject).
152152
*
153153
* \tparam Subject
154-
* The subject type, must meet the `concepts::Element` concept.
154+
* The subject type, must meet the `Element` concept.
155155
*
156156
* \param subject
157157
* The subject to be aligned.
@@ -172,7 +172,7 @@ namespace cycfi::elements
172172
* a subject.
173173
*
174174
* \tparam Subject
175-
* Subject type, must meet the `concepts::Element` concept.
175+
* Subject type, must meet the `Element` concept.
176176
*
177177
* \param align
178178
* The initial alignment value.
@@ -213,7 +213,7 @@ namespace cycfi::elements
213213
* A template class to handle vertical alignment for elements.
214214
*
215215
* \tparam
216-
* Subject Base type, must meet the `concepts::Element` concept,.
216+
* Subject Base type, must meet the `Element` concept.
217217
*/
218218
template <concepts::Element Subject>
219219
class valign_element : public proxy<Subject, align_element_base>
@@ -233,7 +233,7 @@ namespace cycfi::elements
233233
* Aligns the enclosed element (subject) in the y-axis.
234234
*
235235
* \tparam Subject
236-
* The subject type, must meet the `concepts::Element` concept.
236+
* The subject type, must meet the `Element` concept.
237237
*
238238
* \param align
239239
* The alignment value from 0.0 (top) to 1.0 (bottom).
@@ -256,7 +256,7 @@ namespace cycfi::elements
256256
* Top-aligns the enclosed element (subject).
257257
*
258258
* \tparam Subject
259-
* The subject type, must meet the `concepts::Element` concept.
259+
* The subject type, must meet the `Element` concept.
260260
*
261261
* \param subject
262262
* The subject to be aligned.
@@ -276,7 +276,7 @@ namespace cycfi::elements
276276
* Middle-aligns the enclosed element (subject).
277277
*
278278
* \tparam Subject
279-
* The subject type, must meet the `concepts::Element` concept.
279+
* The subject type, must meet the `Element` concept.
280280
*
281281
* \param subject
282282
* The subject to be aligned.
@@ -296,7 +296,7 @@ namespace cycfi::elements
296296
* Bottom-aligns the enclosed element (subject).
297297
*
298298
* \tparam Subject
299-
* The subject type, must meet the `concepts::Element` concept.
299+
* The subject type, must meet the `Element` concept.
300300
*
301301
* \param subject
302302
* The subject to be aligned.
@@ -317,7 +317,7 @@ namespace cycfi::elements
317317
* a subject.
318318
*
319319
* \tparam Subject
320-
* Subject type, must meet the `concepts::Element` concept.
320+
* Subject type, must meet the `Element` concept.
321321
*
322322
* \param align
323323
* The initial alignment value.
@@ -355,7 +355,7 @@ namespace cycfi::elements
355355
* \brief Create an element that is aligned to left and top.
356356
*
357357
* \tparam Subject
358-
* The subject type, must meet the `concepts::Element` concept.
358+
* The subject type, must meet the `Element` concept.
359359
*
360360
* \param subject
361361
* The subject to be aligned.
@@ -373,7 +373,7 @@ namespace cycfi::elements
373373
* \brief Create an element that is aligned to center and top.
374374
*
375375
* \tparam Subject
376-
* The subject type, must meet the `concepts::Element` concept.
376+
* The subject type, must meet the `Element` concept.
377377
*
378378
* \param subject
379379
* The subject to be aligned.
@@ -391,7 +391,7 @@ namespace cycfi::elements
391391
* \brief Create an element that is aligned to right and top.
392392
*
393393
* \tparam Subject
394-
* The subject type, must meet the `concepts::Element` concept.
394+
* The subject type, must meet the `Element` concept.
395395
*
396396
* \param subject
397397
* The subject to be aligned.
@@ -409,7 +409,7 @@ namespace cycfi::elements
409409
* \brief Create an element that is aligned to left and middle.
410410
*
411411
* \tparam Subject
412-
* The subject type, must meet the `concepts::Element` concept.
412+
* The subject type, must meet the `Element` concept.
413413
*
414414
* \param subject
415415
* The subject to be aligned.
@@ -427,7 +427,7 @@ namespace cycfi::elements
427427
* \brief Create an element that is aligned to center and middle.
428428
*
429429
* \tparam Subject
430-
* The subject type, must meet the `concepts::Element` concept.
430+
* The subject type, must meet the `Element` concept.
431431
*
432432
* \param subject
433433
* The subject to be aligned.
@@ -445,7 +445,7 @@ namespace cycfi::elements
445445
* \brief Create an element that is aligned to right and middle.
446446
*
447447
* \tparam Subject
448-
* The subject type, must meet the `concepts::Element` concept.
448+
* The subject type, must meet the `Element` concept.
449449
*
450450
* \param subject
451451
* The subject to be aligned.
@@ -463,7 +463,7 @@ namespace cycfi::elements
463463
* \brief Create an element that is aligned to left and bottom.
464464
*
465465
* \tparam Subject
466-
* The subject type, must meet the `concepts::Element` concept.
466+
* The subject type, must meet the `Element` concept.
467467
*
468468
* \param subject
469469
* The subject to be aligned.
@@ -481,7 +481,7 @@ namespace cycfi::elements
481481
* \brief Create an element that is aligned to center and bottom.
482482
*
483483
* \tparam Subject
484-
* The subject type, must meet the `concepts::Element` concept.
484+
* The subject type, must meet the `Element` concept.
485485
*
486486
* \param subject
487487
* The subject to be aligned.
@@ -499,7 +499,7 @@ namespace cycfi::elements
499499
* \brief Create an element that is aligned to right and bottom.
500500
*
501501
* \tparam Subject
502-
* The subject type, must meet the `concepts::Element` concept.
502+
* The subject type, must meet the `Element` concept.
503503
*
504504
* \param subject
505505
* The subject to be aligned.

‎lib/include/elements/element/button.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ namespace cycfi::elements
148148
* a momentary button from a given styler.
149149
*
150150
* The function uses two template parameters: `Base` and `Styler`. The
151-
* `Base` should be a momentary button that adheres to `concepts::
152-
* MomentaryButton` with `basic_button` as the default type. The
153-
* `Styler` should follow the `concepts::Element`.
151+
* `Base` should be a momentary button that adheres to `
152+
* MomentaryButton` concept with `basic_button` as the default type.
153+
* The `Styler` should follow the `Element` concept.
154154
*
155155
* \param styler
156156
* An rvalue reference to the styler that will be used to render the
@@ -245,9 +245,9 @@ namespace cycfi::elements
245245
* toggle button from a given styler.
246246
*
247247
* The function uses two template parameters: `Base` and `Styler`. The
248-
* `Base` should be a toggle button that adheres to `concepts::
249-
* ToggleButton` with `basic_toggle_button` as the default type. The
250-
* `Styler` should follow the `concepts::Element`.
248+
* `Base` should be a toggle button that adheres to ` ToggleButton`
249+
* concept with `basic_toggle_button` as the default type. The `Styler`
250+
* should follow the `Element` concept.
251251
*
252252
* \param styler
253253
* An rvalue reference to the styler that will be used to render the
@@ -303,9 +303,9 @@ namespace cycfi::elements
303303
* latching button from a given styler.
304304
*
305305
* The function uses two template parameters: `Base` and `Styler`. The
306-
* `Base` should be a latching button that adheres to `concepts::
307-
* LatchingButton` with `basic_latching_button` as the default type.
308-
* The `Styler` should follow the `concepts::Element`.
306+
* `Base` should be a latching button that adheres to `LatchingButton`
307+
* concept with `basic_latching_button` as the default type. The
308+
* `Styler` should follow the `Element` concept.
309309
*
310310
* \param styler
311311
* An rvalue reference to the styler that will be used to render the

0 commit comments

Comments
 (0)