diff --git a/src/bfu/text.c b/src/bfu/text.c index 8e8a8cfe..c741e989 100644 --- a/src/bfu/text.c +++ b/src/bfu/text.c @@ -397,11 +397,16 @@ dlg_format_text(struct dialog_data *dlg_data, widget_data->info.text.current = 0; } - dlg_format_text_do(dlg_data, text, +// dlg_format_text_do(dlg_data, text, +// x, y, width, real_width, +// get_bfu_color(term, "dialog.text"), +// widget_data->widget->info.text.align, format_only); + dlg_format_text_do_node(dlg_data, text, x, y, width, real_width, - get_bfu_color(term, "dialog.text"), + get_bfu_color_node(term, "dialog.text"), widget_data->widget->info.text.align, format_only); + if (widget_data->widget->info.text.is_label) (*y)--; /* If we scrolled and something was trimmed restore it */ @@ -425,8 +430,10 @@ display_text(struct dialog_data *dlg_data, struct widget_data *widget_data) if (!text_is_scrollable(widget_data) || box.height <= 0) return EVENT_PROCESSED; - draw_box(win->term, &box, ' ', 0, - get_bfu_color(win->term, "dialog.scrollbar")); +// draw_box(win->term, &box, ' ', 0, +// get_bfu_color(win->term, "dialog.scrollbar")); + draw_box_node(win->term, &box, ' ', 0, + get_bfu_color_node(win->term, "dialog.scrollbar")); current = widget_data->info.text.current; scale = (box.height + 1) * 100 / lines; @@ -452,8 +459,10 @@ display_text(struct dialog_data *dlg_data, struct widget_data *widget_data) widget_data->info.text.scroller_y = box.y; #endif - draw_box(win->term, &box, ' ', 0, - get_bfu_color(win->term, "dialog.scrollbar-selected")); +// draw_box(win->term, &box, ' ', 0, +// get_bfu_color(win->term, "dialog.scrollbar-selected")); + draw_box_node(win->term, &box, ' ', 0, + get_bfu_color_node(win->term, "dialog.scrollbar-selected")); /* Hope this is at least a bit reasonable. Set cursor * and window pointer to start of the first text line. */ @@ -482,8 +491,10 @@ format_and_display_text(struct widget_data *widget_data, widget_data->info.text.current = current; - draw_box(term, &widget_data->box, ' ', 0, - get_bfu_color(term, "dialog.generic")); +// draw_box(term, &widget_data->box, ' ', 0, +// get_bfu_color(term, "dialog.generic")); + draw_box_node(term, &widget_data->box, ' ', 0, + get_bfu_color_node(term, "dialog.generic")); dlg_format_text(dlg_data, widget_data, widget_data->box.x, &y, widget_data->box.width, NULL,