From a38946b803917897243ecaaafa7e36f0209869c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Tue, 20 Aug 2019 18:12:40 +0200 Subject: [PATCH] LayerSelector: Rewrite layer_selector_export_rendered_layer_info() to return LayerSettings object. --- include/gds-render/layer/layer-selector.h | 5 +-- layer/layer-selector.c | 39 ++++++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/include/gds-render/layer/layer-selector.h b/include/gds-render/layer/layer-selector.h index 240982d..549be03 100644 --- a/include/gds-render/layer/layer-selector.h +++ b/include/gds-render/layer/layer-selector.h @@ -34,6 +34,7 @@ #include #include #include +#include G_BEGIN_DECLS @@ -80,9 +81,9 @@ void layer_selector_set_save_mapping_button(LayerSelector *selector, GtkWidget * /** * @brief Get a list of all layers that shall be exported when rendering the cells * @param selector Layer selector instance - * @return List of layer_info structures containing the layer information + * @return LayerSettings containing the layer information */ -GList *layer_selector_export_rendered_layer_info(LayerSelector *selector); +LayerSettings *layer_selector_export_rendered_layer_info(LayerSelector *selector); /** * @brief Force the layer selector list to be sorted according to \p sort_function diff --git a/layer/layer-selector.c b/layer/layer-selector.c index 95b0cf5..d8f4199 100644 --- a/layer/layer-selector.c +++ b/layer/layer-selector.c @@ -371,38 +371,39 @@ LayerSelector *layer_selector_new(GtkListBox *list_box) return selector; } -GList *layer_selector_export_rendered_layer_info(LayerSelector *selector) +LayerSettings *layer_selector_export_rendered_layer_info(LayerSelector *selector) { - GList *info_list = NULL; - LayerElement *le; - struct layer_info *linfo; + LayerSettings *layer_settings; + struct layer_info linfo; GList *row_list; - GList *temp; + GList *iterator; + LayerElement *le; int i; - if (!selector) + layer_settings = layer_settings_new(); + if (!layer_settings) return NULL; row_list = gtk_container_get_children(GTK_CONTAINER(selector->list_box)); - /* Iterate through widgets and add layers that shall be exported */ - for (i = 0, temp = row_list; temp != NULL; temp = temp->next, i++) { + for (i = 0,iterator = row_list; iterator != NULL; iterator = g_list_next(iterator), i++) { + le = LAYER_ELEMENT(iterator->data); - le = LAYER_ELEMENT(temp->data); + /* Get name from layer element. This must not be freed */ + linfo.name =(char *)layer_element_get_name(le); - if (layer_element_get_export(le) == TRUE) { - /* Allocate new info and fill with info */ - linfo = (struct layer_info *)malloc(sizeof(struct layer_info)); - layer_element_get_color(le, &linfo->color); - linfo->layer = layer_element_get_layer(le); - linfo->name = (char *)layer_element_get_name(le); + layer_element_get_color(le, &linfo.color); + linfo.render = (layer_element_get_export(le) ? 1 : 0); + linfo.stacked_position = i; + linfo.layer = layer_element_get_layer(le); - /* Append to list */ - info_list = g_list_append(info_list, (gpointer)linfo); - } + /* This function copies the entire layer info struct including the name string. + * Therefore, using the same layer_info struct over and over is safe. + */ + layer_settings_append_layer_info(layer_settings, &linfo); } - return info_list; + return layer_settings; } static void layer_selector_clear_widgets(LayerSelector *self)