Updating doc of group, correcting chained list behaviour, completing implementation of group_init, implementing group_print and group_click_handler to delegate on components

2 files changed, 64 insertions, 27 deletions

diff --git a/include/gui/group.h b/include/gui/group.h
index 88fffbc..2a02ee4 100644
--- a/include/gui/group.h
+++ b/include/gui/group.h
@@ -28,22 +28,33 @@ typedef struct _GroupElement {
  * Parameters:
  *  component - Component used for the Group to catch clicks and handle print to delegate to the components contented in it
  *  *group_head - pointer to the head of the list that regroup all the components contained inside of the group
- *  padding - padding for all components
+ *  margin - margin for all components
  */
 typedef struct {
   Component component;
   GroupElement *group_head;
-  int padding;
+  int margin;
 } Group;
 
 /**
  * Function: group_print
- * Print method for a group (BETA VERSION).
+ * Print method for a group that will print all components contained in.
  *
  * Parameters:
- *  *parameter - pointer that will be casted into a Group to print
+ *  *parameterSelf - pointer that will be casted into a Group to print
  */
-void group_print(void *parameter);
+void group_print(Component *parameterSelf);
+
+/**
+ * Function: group_click_handler
+ * Delegates the click handling to the component contained inside.
+ *
+ * Parameters:
+ *  x_pos - position of the mouse on x axis
+ *  y_pos - position of the mouse on y axis
+ *  *parameterSelf - pointer that will be casted into a Group to print
+ */
+void group_click_handler(int x_pos, int y_pos, Component *parameterSelf);
 
 /**
  * Function: group_init
@@ -55,9 +66,9 @@ void group_print(void *parameter);
  *  height - height of the current group
  *  x_pos - position on the x axis from the upper left corner
  *  y_pos - position on the y axis from the upper left corner
- *  padding - space between each components
+ *  margin - space between each components
  */
-void group_init(Group *group, int width, int height, int x_pos, int y_pos, int padding);
+void group_init(Group *group, int width, int height, int x_pos, int y_pos, int margin);
 
 /**
  * Function: group_free
@@ -78,4 +89,5 @@ void group_free(Group *group);
  */
 void group_add_component(Group *group, Component *component);
 
+
 #endif
diff --git a/src/gui/group.c b/src/gui/group.c
index cb50b1c..d287205 100644
--- a/src/gui/group.c
+++ b/src/gui/group.c
@@ -2,38 +2,56 @@
 #include <gui/group.h>
 #include <common/mem.h>
 #include <assert.h>
+#include <gui/component.h>
 #include "MLV/MLV_shape.h"
 #include "MLV/MLV_window.h"
 
-void group_print(void *parameter) {
-  Group *group = (Group *) parameter;
-  /*DEBUG*/
-  MLV_draw_filled_rectangle(group->component.x_pos, group->component.y_pos, group->component.width,
-                            group->component.height, MLV_COLOR_AQUAMARINE);
-  /**/
-  MLV_actualise_window();
+void group_print(Component *parameterSelf) {
+  assert(parameterSelf != NULL);
+  Group *self = (Group *) parameterSelf;
+  if (self->group_head != NULL) {
+    GroupElement *p = self->group_head;
+    while (p != NULL) {
+      p->sub_component->print_method(p->sub_component);
+      p = p->next;
+    }
+  }
+}
+
+void group_click_handler(int x_pos, int y_pos, Component *parameterSelf) {
+  assert(parameterSelf != NULL);
+  Group *self = (Group *) parameterSelf;
+  if (self->group_head != NULL) {
+    GroupElement *p = self->group_head;
+    while (p != NULL) {
+      p->sub_component->click_handler(x_pos, y_pos, p->sub_component);
+      p = p->next;
+    }
+  }
 }
 
-void group_init(Group *group, int width, int height, int x_pos, int y_pos, int padding) {
+void group_init(Group *group, int width, int height, int x_pos, int y_pos, int margin) {
   assert(group != NULL);
   assert(width > 0);
   assert(height > 0);
   assert(x_pos >= 0);
   assert(y_pos >= 0);
-  assert(padding >= 0);
+  assert(margin >= 0);
   group->component.width = width;
   group->component.height = height;
   group->component.x_pos = x_pos;
   group->component.y_pos = y_pos;
   group->component.print_method = group_print;
-  group->padding = padding;
+  group->component.click_handler = group_click_handler;
+  group->margin = margin;
 }
 
 void group_free(Group *group) {
+  assert(group != NULL);
   if (group->group_head != NULL) {
     GroupElement *p = group->group_head;
-    while (p->next != NULL) {
-      GroupElement *tmp = group->group_head;
+    while (p != NULL) {
+      GroupElement *tmp = p;
       p = p->next;
       free(tmp);
     }
@@ -42,20 +60,27 @@ void group_free(Group *group) {
 }
 
 void group_add_component(Group *group, Component *component) {
+  assert(group != NULL);
+  assert(component != NULL);
+  /*Initialize the new node*/
+  GroupElement *tmp = malloc_or_die(sizeof(GroupElement));
+  tmp->sub_component = component;
+  tmp->next = NULL;
   if (group->group_head != NULL) {
-    /*Initialize the new node*/
-    GroupElement *tmp = malloc_or_die(sizeof(GroupElement));
-    tmp->sub_component = component;
-    tmp->next = NULL;
     GroupElement *p = group->group_head;
     /*Browsing*/
     while (p->next != NULL) {
       p = p->next;
     }
     p->next = tmp;
+    /*Modifying for margin*/
+    tmp->sub_component->y_pos = p->sub_component->y_pos;
+    tmp->sub_component->x_pos = p->sub_component->x_pos + p->sub_component->width + group->margin;
   } else {
-    group->group_head = malloc_or_die(sizeof(GroupElement));
-    group->group_head->sub_component = component;
-    group->group_head->next = NULL;
+    tmp->sub_component->y_pos = group->component.y_pos;
+    tmp->sub_component->x_pos = group->component.x_pos;
+    group->group_head = tmp;
+
   }
-}
\ No newline at end of file
+}
+