Merge branch 'skia_2024' into docs_2024

djowel · djowel · commit c5ea1620b8a4 · 2024-08-08T08:53:05.000+08:00
diff --git a/lib/include/elements/element/style/button.hpp b/lib/include/elements/element/style/button.hpp
@@ -377,7 +377,7 @@ namespace cycfi::elements
     * \tparam Direction
     *    The direction specifying which half of the button has rounded corners.
     */
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    struct button_styler_rounded_half : Base
    {
       using base_type = button_styler_rounded_half<typename Base::base_type, Direction>;
@@ -399,7 +399,7 @@ namespace cycfi::elements
       float                   _radius;
    };
 
-   template<typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    struct button_styler_rounded_half_default : Base
    {
       using base_type = button_styler_rounded_half_default<typename Base::base_type, Direction>;
@@ -416,7 +416,7 @@ namespace cycfi::elements
       virtual float           get_corner_radius_bottom_right() const override;
    };
 
-   template<typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    struct button_styler_rounded_corner : Base
    {
       using base_type = button_styler_rounded_corner<typename Base::base_type, Corner>;
@@ -977,7 +977,7 @@ namespace cycfi::elements
       _radius = r;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_left() const
    {
       if constexpr (Direction == direction_t::up || Direction == direction_t::left)
@@ -988,7 +988,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_right() const
    {
       if constexpr (Direction == direction_t::up || Direction == direction_t::right)
@@ -999,7 +999,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_left() const
    {
       if constexpr (Direction == direction_t::down || Direction == direction_t::left)
@@ -1010,7 +1010,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_right() const
    {
       if constexpr (Direction == direction_t::down || Direction == direction_t::right)
@@ -1021,13 +1021,13 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline void button_styler_rounded_half<Base, Direction>::set_corner_radius(float r)
    {
       _radius = r;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_left() const
    {
       if constexpr (Direction == direction_t::up || Direction == direction_t::left)
@@ -1038,7 +1038,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_right() const
    {
       if constexpr (Direction == direction_t::up || Direction == direction_t::right)
@@ -1049,7 +1049,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_left() const
    {
       if constexpr (Direction == direction_t::down || Direction == direction_t::left)
@@ -1060,7 +1060,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::direction Direction>
+   template <concepts::ButtonStyler Base, default_button_styler::direction Direction>
    inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_right() const
    {
       if constexpr (Direction == direction_t::down || Direction == direction_t::right)
@@ -1071,7 +1071,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_left() const
    {
       if constexpr (Corner == corner_t::top_left)
@@ -1082,7 +1082,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_right() const
    {
       if constexpr (Corner == corner_t::top_right)
@@ -1093,7 +1093,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_left() const
    {
       if constexpr (Corner == corner_t::bottom_left)
@@ -1104,7 +1104,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_right() const
    {
       if constexpr (Corner == corner_t::bottom_right)
@@ -1115,7 +1115,7 @@ namespace cycfi::elements
          return 0.0f;
    }
 
-   template <typename Base, default_button_styler::corner Corner>
+   template <concepts::ButtonStyler Base, default_button_styler::corner Corner>
    inline void button_styler_rounded_corner<Base, Corner>::set_corner_radius(float r)
    {
       _radius = r;

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ namespace cycfi::elements`
`377`	`377`	`* \tparam Direction`
`378`	`378`	`* The direction specifying which half of the button has rounded corners.`
`379`	`379`	`*/`
`380`		`- template <typename Base, default_button_styler::direction Direction>`
	`380`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`381`	`381`	`struct button_styler_rounded_half : Base`
`382`	`382`	`{`
`383`	`383`	`using base_type = button_styler_rounded_half<typename Base::base_type, Direction>;`
`@@ -399,7 +399,7 @@ namespace cycfi::elements`
`399`	`399`	`float _radius;`
`400`	`400`	`};`
`401`	`401`
`402`		`- template<typename Base, default_button_styler::direction Direction>`
	`402`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`403`	`403`	`struct button_styler_rounded_half_default : Base`
`404`	`404`	`{`
`405`	`405`	`using base_type = button_styler_rounded_half_default<typename Base::base_type, Direction>;`
`@@ -416,7 +416,7 @@ namespace cycfi::elements`
`416`	`416`	`virtual float get_corner_radius_bottom_right() const override;`
`417`	`417`	`};`
`418`	`418`
`419`		`- template<typename Base, default_button_styler::corner Corner>`
	`419`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`420`	`420`	`struct button_styler_rounded_corner : Base`
`421`	`421`	`{`
`422`	`422`	`using base_type = button_styler_rounded_corner<typename Base::base_type, Corner>;`
`@@ -977,7 +977,7 @@ namespace cycfi::elements`
`977`	`977`	`_radius = r;`
`978`	`978`	`}`
`979`	`979`
`980`		`- template <typename Base, default_button_styler::direction Direction>`
	`980`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`981`	`981`	`inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_left() const`
`982`	`982`	`{`
`983`	`983`	`if constexpr (Direction == direction_t::up \|\| Direction == direction_t::left)`
`@@ -988,7 +988,7 @@ namespace cycfi::elements`
`988`	`988`	`return 0.0f;`
`989`	`989`	`}`
`990`	`990`
`991`		`- template <typename Base, default_button_styler::direction Direction>`
	`991`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`992`	`992`	`inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_top_right() const`
`993`	`993`	`{`
`994`	`994`	`if constexpr (Direction == direction_t::up \|\| Direction == direction_t::right)`
`@@ -999,7 +999,7 @@ namespace cycfi::elements`
`999`	`999`	`return 0.0f;`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`		`- template <typename Base, default_button_styler::direction Direction>`
	`1002`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1003`	`1003`	`inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_left() const`
`1004`	`1004`	`{`
`1005`	`1005`	`if constexpr (Direction == direction_t::down \|\| Direction == direction_t::left)`
`@@ -1010,7 +1010,7 @@ namespace cycfi::elements`
`1010`	`1010`	`return 0.0f;`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`		`- template <typename Base, default_button_styler::direction Direction>`
	`1013`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1014`	`1014`	`inline float button_styler_rounded_half<Base, Direction>::get_corner_radius_bottom_right() const`
`1015`	`1015`	`{`
`1016`	`1016`	`if constexpr (Direction == direction_t::down \|\| Direction == direction_t::right)`
`@@ -1021,13 +1021,13 @@ namespace cycfi::elements`
`1021`	`1021`	`return 0.0f;`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`		`- template <typename Base, default_button_styler::direction Direction>`
	`1024`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1025`	`1025`	`inline void button_styler_rounded_half<Base, Direction>::set_corner_radius(float r)`
`1026`	`1026`	`{`
`1027`	`1027`	`_radius = r;`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`		`- template <typename Base, default_button_styler::direction Direction>`
	`1030`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1031`	`1031`	`inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_left() const`
`1032`	`1032`	`{`
`1033`	`1033`	`if constexpr (Direction == direction_t::up \|\| Direction == direction_t::left)`
`@@ -1038,7 +1038,7 @@ namespace cycfi::elements`
`1038`	`1038`	`return 0.0f;`
`1039`	`1039`	`}`
`1040`	`1040`
`1041`		`- template <typename Base, default_button_styler::direction Direction>`
	`1041`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1042`	`1042`	`inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_top_right() const`
`1043`	`1043`	`{`
`1044`	`1044`	`if constexpr (Direction == direction_t::up \|\| Direction == direction_t::right)`
`@@ -1049,7 +1049,7 @@ namespace cycfi::elements`
`1049`	`1049`	`return 0.0f;`
`1050`	`1050`	`}`
`1051`	`1051`
`1052`		`- template <typename Base, default_button_styler::direction Direction>`
	`1052`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1053`	`1053`	`inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_left() const`
`1054`	`1054`	`{`
`1055`	`1055`	`if constexpr (Direction == direction_t::down \|\| Direction == direction_t::left)`
`@@ -1060,7 +1060,7 @@ namespace cycfi::elements`
`1060`	`1060`	`return 0.0f;`
`1061`	`1061`	`}`
`1062`	`1062`
`1063`		`- template <typename Base, default_button_styler::direction Direction>`
	`1063`	`+ template <concepts::ButtonStyler Base, default_button_styler::direction Direction>`
`1064`	`1064`	`inline float button_styler_rounded_half_default<Base, Direction>::get_corner_radius_bottom_right() const`
`1065`	`1065`	`{`
`1066`	`1066`	`if constexpr (Direction == direction_t::down \|\| Direction == direction_t::right)`
`@@ -1071,7 +1071,7 @@ namespace cycfi::elements`
`1071`	`1071`	`return 0.0f;`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`		`- template <typename Base, default_button_styler::corner Corner>`
	`1074`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`1075`	`1075`	`inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_left() const`
`1076`	`1076`	`{`
`1077`	`1077`	`if constexpr (Corner == corner_t::top_left)`
`@@ -1082,7 +1082,7 @@ namespace cycfi::elements`
`1082`	`1082`	`return 0.0f;`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`		`- template <typename Base, default_button_styler::corner Corner>`
	`1085`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`1086`	`1086`	`inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_top_right() const`
`1087`	`1087`	`{`
`1088`	`1088`	`if constexpr (Corner == corner_t::top_right)`
`@@ -1093,7 +1093,7 @@ namespace cycfi::elements`
`1093`	`1093`	`return 0.0f;`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`		`- template <typename Base, default_button_styler::corner Corner>`
	`1096`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`1097`	`1097`	`inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_left() const`
`1098`	`1098`	`{`
`1099`	`1099`	`if constexpr (Corner == corner_t::bottom_left)`
`@@ -1104,7 +1104,7 @@ namespace cycfi::elements`
`1104`	`1104`	`return 0.0f;`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`		`- template <typename Base, default_button_styler::corner Corner>`
	`1107`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`1108`	`1108`	`inline float button_styler_rounded_corner<Base, Corner>::get_corner_radius_bottom_right() const`
`1109`	`1109`	`{`
`1110`	`1110`	`if constexpr (Corner == corner_t::bottom_right)`
`@@ -1115,7 +1115,7 @@ namespace cycfi::elements`
`1115`	`1115`	`return 0.0f;`
`1116`	`1116`	`}`
`1117`	`1117`
`1118`		`- template <typename Base, default_button_styler::corner Corner>`
	`1118`	`+ template <concepts::ButtonStyler Base, default_button_styler::corner Corner>`
`1119`	`1119`	`inline void button_styler_rounded_corner<Base, Corner>::set_corner_radius(float r)`
`1120`	`1120`	`{`
`1121`	`1121`	`_radius = r;`