diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/button.c | 3 | ||||
-rw-r--r-- | src/gui/group.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/button.c b/src/gui/button.c index fbdc172..96cbd9a 100644 --- a/src/gui/button.c +++ b/src/gui/button.c | |||
@@ -33,7 +33,7 @@ void button_click_test(int x, int y, Component *parameterSelf) { | |||
33 | assert(y >= 0); | 33 | assert(y >= 0); |
34 | assert(parameterSelf != NULL); | 34 | assert(parameterSelf != NULL); |
35 | Button *self = (Button *) parameterSelf; | 35 | Button *self = (Button *) parameterSelf; |
36 | if (button_is_selected(x, y, self)) { | 36 | if (button_is_selected(x, y, self) && self->component.activated) { |
37 | printf("OK\n"); | 37 | printf("OK\n"); |
38 | } | 38 | } |
39 | } | 39 | } |
@@ -51,6 +51,7 @@ button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int | |||
51 | MLV_get_size_of_adapted_text_box(text, sizeInterligne, &button->component.width, &button->component.height); | 51 | MLV_get_size_of_adapted_text_box(text, sizeInterligne, &button->component.width, &button->component.height); |
52 | button->component.x_pos = x_pos; | 52 | button->component.x_pos = x_pos; |
53 | button->component.y_pos = y_pos; | 53 | button->component.y_pos = y_pos; |
54 | button->component.activated = true; | ||
54 | button->component.print_method = button_print; | 55 | button->component.print_method = button_print; |
55 | button->component.click_handler = clickHandler; | 56 | button->component.click_handler = clickHandler; |
56 | } | 57 | } |
diff --git a/src/gui/group.c b/src/gui/group.c index d287205..11a0583 100644 --- a/src/gui/group.c +++ b/src/gui/group.c | |||
@@ -21,7 +21,8 @@ void group_print(Component *parameterSelf) { | |||
21 | void group_click_handler(int x_pos, int y_pos, Component *parameterSelf) { | 21 | void group_click_handler(int x_pos, int y_pos, Component *parameterSelf) { |
22 | assert(parameterSelf != NULL); | 22 | assert(parameterSelf != NULL); |
23 | Group *self = (Group *) parameterSelf; | 23 | Group *self = (Group *) parameterSelf; |
24 | if (self->group_head != NULL) { | 24 | |
25 | if (self->group_head != NULL && self->component.activated) { | ||
25 | GroupElement *p = self->group_head; | 26 | GroupElement *p = self->group_head; |
26 | while (p != NULL) { | 27 | while (p != NULL) { |
27 | p->sub_component->click_handler(x_pos, y_pos, p->sub_component); | 28 | p->sub_component->click_handler(x_pos, y_pos, p->sub_component); |
@@ -41,6 +42,7 @@ void group_init(Group *group, int width, int height, int x_pos, int y_pos, int m | |||
41 | group->component.height = height; | 42 | group->component.height = height; |
42 | group->component.x_pos = x_pos; | 43 | group->component.x_pos = x_pos; |
43 | group->component.y_pos = y_pos; | 44 | group->component.y_pos = y_pos; |
45 | group->component.activated = true; | ||
44 | group->component.print_method = group_print; | 46 | group->component.print_method = group_print; |
45 | group->component.click_handler = group_click_handler; | 47 | group->component.click_handler = group_click_handler; |
46 | group->margin = margin; | 48 | group->margin = margin; |