update icon list

ARM-software · Nov 25, 2024 · 01a5f28 · 01a5f28
1 parent 12c297b
commit 01a5f28
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/ARM.Arm-2D.pdsc b/ARM.Arm-2D.pdsc
@@ -450,7 +450,7 @@
           </RTE_Components_h>
         </component>
 
-        <component Cclass="Acceleration" Cgroup="Arm-2D Extras" Csub="Controls" Cversion="2.0.1" condition="Arm-2D-Controls">
+        <component Cclass="Acceleration" Cgroup="Arm-2D Extras" Csub="Controls" Cversion="2.1.0" condition="Arm-2D-Controls">
           <description>A set of example controls, e.g. round-corner-box, spinning-wheels etc</description>
           <files>
             <!-- example control source files -->

diff --git a/examples/common/controls/icon_list.c b/examples/common/controls/icon_list.c
@@ -122,17 +122,19 @@ arm_fsm_rt_t __arm_2d_icon_list_draw_list_core_item(
     return arm_fsm_rt_cpl;
 }
 
-ARM_NONNULL(1,2)
-arm_2d_err_t icon_list_init(  icon_list_t *ptThis, 
-                        icon_list_cfg_t *ptCFG)
+ARM_NONNULL(1, 2, 3)
+arm_2d_err_t __icon_list_init(  icon_list_t *ptThis, 
+                                icon_list_cfg_t *ptCFG,
+                                arm_2d_i_list_region_calculator_t *ptCalculator)
 {
     assert(NULL != ptThis);
     assert(NULL != ptCFG);
+    assert(NULL != ptCalculator);
 
     arm_2d_err_t tResult =  __simple_list_init(
         &this.use_as____simple_list_t,
         &ptCFG->use_as____simple_list_cfg_t,
-        &ARM_2D_LIST_CALCULATOR_MIDDLE_ALIGNED_FIXED_SIZED_ITEM_NO_STATUS_CHECK_HORIZONTAL);
+        ptCalculator);
 
     if (ARM_2D_ERR_NONE != tResult) {
         return tResult;

diff --git a/examples/common/controls/icon_list.h b/examples/common/controls/icon_list.h
@@ -51,6 +51,12 @@ extern "C" {
 
 
 /*============================ MACROFIED FUNCTIONS ===========================*/
+
+#define icon_list_init(__ICON_LIST_PTR, __CFG_PTR, ...)                         \
+            __icon_list_init(   (__ICON_LIST_PTR),                              \
+                                (__CFG_PTR),                                    \
+                                (&ARM_2D_LIST_CALCULATOR_MIDDLE_ALIGNED_FIXED_SIZED_ITEM_NO_STATUS_CHECK_VERTICAL, ##__VA_ARGS__))
+
 /*============================ TYPES =========================================*/
 
 typedef struct icon_list_cfg_t {
@@ -77,9 +83,11 @@ typedef struct icon_list_t {
 /*============================ PROTOTYPES ====================================*/
 
 extern
-ARM_NONNULL(1,2)
-arm_2d_err_t icon_list_init(icon_list_t *ptThis, 
-                            icon_list_cfg_t *ptCFG);
+ARM_NONNULL(1, 2, 3)
+arm_2d_err_t __icon_list_init(
+                            icon_list_t *ptThis, 
+                            icon_list_cfg_t *ptCFG,
+                            arm_2d_i_list_region_calculator_t *ptCalculator);
 
 extern
 ARM_NONNULL(1)