UI: nested groups. not finished
This commit is contained in:
+24
-6
@@ -3,12 +3,14 @@
|
||||
#include "fs_file_list.h"
|
||||
#include "input.h"
|
||||
#include "progress_bar.h"
|
||||
#include "widget_core.h"
|
||||
#include <ncurses.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/* make response -1 */
|
||||
#define MAKE_RESPONSE_M1(args, resp_data, response) \
|
||||
if (args->resp_data != NULL) { \
|
||||
*response = -1; \
|
||||
@@ -62,7 +64,7 @@ void group_default_callback(callback_args_t *args) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
widget = (widget_t *) element_ptr->element;
|
||||
widget = (widget_t *)element_ptr->element;
|
||||
if (widget->callback != NULL) {
|
||||
memccpy(&new_args, args, 1, sizeof(callback_args_t));
|
||||
new_args.element = element_ptr->element;
|
||||
@@ -104,9 +106,13 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
|
||||
w = &(((button_t *)elements[i].element)->w);
|
||||
break;
|
||||
case w_box:
|
||||
case w_group:
|
||||
case w_end:
|
||||
break;
|
||||
case w_group:
|
||||
elements[i].element = init_group(win, &(group->w), children[i].children,
|
||||
children[i].direction);
|
||||
w = &(((input_t *)elements[i].element)->w);
|
||||
break;
|
||||
case w_input:
|
||||
elements[i].element =
|
||||
init_input(win, &(group->w), children[i].label, children[i].length,
|
||||
@@ -130,6 +136,12 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
|
||||
group->w.x += w->x + 1;
|
||||
if (group->w.y < w->y)
|
||||
group->w.y = w->y;
|
||||
} else {
|
||||
w->m_x = group->w.m_x;
|
||||
w->m_y = group->w.m_y + group->w.y;
|
||||
group->w.y += w->y;
|
||||
if (group->w.x < w->x)
|
||||
group->w.x = w->x;
|
||||
}
|
||||
if (i == 0) {
|
||||
group->first_id = w->id;
|
||||
@@ -139,11 +151,13 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
|
||||
}
|
||||
}
|
||||
|
||||
if (direction == vertical)
|
||||
group->w.y++;
|
||||
|
||||
return group;
|
||||
}
|
||||
|
||||
void draw_group(WINDOW *win, group_t *group, int32_t active_id,
|
||||
widget_t *dialog_w) {
|
||||
void draw_group(WINDOW *win, group_t *group, int32_t active_id) {
|
||||
group_el_t *children = group->elements;
|
||||
for (int i = 0; i < group->count; i++) {
|
||||
group_el_t *el = &children[i];
|
||||
@@ -151,8 +165,10 @@ void draw_group(WINDOW *win, group_t *group, int32_t active_id,
|
||||
case w_button:
|
||||
draw_button((button_t *)el->element, active_id);
|
||||
break;
|
||||
case w_box:
|
||||
case w_group:
|
||||
draw_group(win, (group_t *)el->element, active_id);
|
||||
break;
|
||||
case w_box:
|
||||
case w_end:
|
||||
break;
|
||||
case w_input:
|
||||
@@ -176,8 +192,10 @@ void destroy_group(group_t *group) {
|
||||
case w_button:
|
||||
destroy_button(el->element);
|
||||
break;
|
||||
case w_box:
|
||||
case w_group:
|
||||
destroy_group(el->element);
|
||||
break;
|
||||
case w_box:
|
||||
case w_end:
|
||||
break;
|
||||
case w_input:
|
||||
|
||||
Reference in New Issue
Block a user