Skip to content

Commit c5ea162

Browse files
committed
Merge branch 'skia_2024' into docs_2024
2 parents 27cc720 + 83e5475 commit c5ea162

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ namespace cycfi::elements
377377
* \tparam Direction
378378
* The direction specifying which half of the button has rounded corners.
379379
*/
380-
template <typename Base, default_button_styler::direction Direction>
380+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
381381
struct button_styler_rounded_half : Base
382382
{
383383
using base_type = button_styler_rounded_half<typename Base::base_type, Direction>;
@@ -399,7 +399,7 @@ namespace cycfi::elements
399399
float _radius;
400400
};
401401

402-
template<typename Base, default_button_styler::direction Direction>
402+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
403403
struct button_styler_rounded_half_default : Base
404404
{
405405
using base_type = button_styler_rounded_half_default<typename Base::base_type, Direction>;
@@ -416,7 +416,7 @@ namespace cycfi::elements
416416
virtual float get_corner_radius_bottom_right() const override;
417417
};
418418

419-
template<typename Base, default_button_styler::corner Corner>
419+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
420420
struct button_styler_rounded_corner : Base
421421
{
422422
using base_type = button_styler_rounded_corner<typename Base::base_type, Corner>;
@@ -977,7 +977,7 @@ namespace cycfi::elements
977977
_radius = r;
978978
}
979979

980-
template <typename Base, default_button_styler::direction Direction>
980+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
981981
inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_left() const
982982
{
983983
if constexpr (Direction == direction_t::up || Direction == direction_t::left)
@@ -988,7 +988,7 @@ namespace cycfi::elements
988988
return 0.0f;
989989
}
990990

991-
template <typename Base, default_button_styler::direction Direction>
991+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
992992
inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_right() const
993993
{
994994
if constexpr (Direction == direction_t::up || Direction == direction_t::right)
@@ -999,7 +999,7 @@ namespace cycfi::elements
999999
return 0.0f;
10001000
}
10011001

1002-
template <typename Base, default_button_styler::direction Direction>
1002+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10031003
inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_left() const
10041004
{
10051005
if constexpr (Direction == direction_t::down || Direction == direction_t::left)
@@ -1010,7 +1010,7 @@ namespace cycfi::elements
10101010
return 0.0f;
10111011
}
10121012

1013-
template <typename Base, default_button_styler::direction Direction>
1013+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10141014
inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_right() const
10151015
{
10161016
if constexpr (Direction == direction_t::down || Direction == direction_t::right)
@@ -1021,13 +1021,13 @@ namespace cycfi::elements
10211021
return 0.0f;
10221022
}
10231023

1024-
template <typename Base, default_button_styler::direction Direction>
1024+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10251025
inline void button_styler_rounded_half<Base, Direction>::set_corner_radius(float r)
10261026
{
10271027
_radius = r;
10281028
}
10291029

1030-
template <typename Base, default_button_styler::direction Direction>
1030+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10311031
inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_left() const
10321032
{
10331033
if constexpr (Direction == direction_t::up || Direction == direction_t::left)
@@ -1038,7 +1038,7 @@ namespace cycfi::elements
10381038
return 0.0f;
10391039
}
10401040

1041-
template <typename Base, default_button_styler::direction Direction>
1041+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10421042
inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_right() const
10431043
{
10441044
if constexpr (Direction == direction_t::up || Direction == direction_t::right)
@@ -1049,7 +1049,7 @@ namespace cycfi::elements
10491049
return 0.0f;
10501050
}
10511051

1052-
template <typename Base, default_button_styler::direction Direction>
1052+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10531053
inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_left() const
10541054
{
10551055
if constexpr (Direction == direction_t::down || Direction == direction_t::left)
@@ -1060,7 +1060,7 @@ namespace cycfi::elements
10601060
return 0.0f;
10611061
}
10621062

1063-
template <typename Base, default_button_styler::direction Direction>
1063+
template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
10641064
inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_right() const
10651065
{
10661066
if constexpr (Direction == direction_t::down || Direction == direction_t::right)
@@ -1071,7 +1071,7 @@ namespace cycfi::elements
10711071
return 0.0f;
10721072
}
10731073

1074-
template <typename Base, default_button_styler::corner Corner>
1074+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
10751075
inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_left() const
10761076
{
10771077
if constexpr (Corner == corner_t::top_left)
@@ -1082,7 +1082,7 @@ namespace cycfi::elements
10821082
return 0.0f;
10831083
}
10841084

1085-
template <typename Base, default_button_styler::corner Corner>
1085+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
10861086
inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_right() const
10871087
{
10881088
if constexpr (Corner == corner_t::top_right)
@@ -1093,7 +1093,7 @@ namespace cycfi::elements
10931093
return 0.0f;
10941094
}
10951095

1096-
template <typename Base, default_button_styler::corner Corner>
1096+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
10971097
inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_left() const
10981098
{
10991099
if constexpr (Corner == corner_t::bottom_left)
@@ -1104,7 +1104,7 @@ namespace cycfi::elements
11041104
return 0.0f;
11051105
}
11061106

1107-
template <typename Base, default_button_styler::corner Corner>
1107+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
11081108
inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_right() const
11091109
{
11101110
if constexpr (Corner == corner_t::bottom_right)
@@ -1115,7 +1115,7 @@ namespace cycfi::elements
11151115
return 0.0f;
11161116
}
11171117

1118-
template <typename Base, default_button_styler::corner Corner>
1118+
template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
11191119
inline void button_styler_rounded_corner<Base, Corner>::set_corner_radius(float r)
11201120
{
11211121
_radius = r;

0 commit comments

Comments
 (0)