mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Drag and drop layer arrangement. Major Feature

Browse Source
This commit is contained in:
Mario Hüttel 2018-05-23 01:03:16 +02:00
parent 084c6999c7
commit 6c24cebaf7
4 changed files with 196 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
glade/layer-widget.glade
View File

@ -12,6 +12,24 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">3</property> <property name="spacing">3</property>
<child>
<object class="GtkEventBox" id="event-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-justify-fill</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="layer"> <object class="GtkLabel" id="layer">
<property name="visible">True</property> <property name="visible">True</property>
@ -21,7 +39,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -36,7 +54,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -47,21 +65,6 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry-stack">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">5</property>
<property name="width_chars">5</property>
<property name="max_width_chars">4</property>
<property name="input_purpose">number</property>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>

154
layer-selector.c
View File

@ -24,9 +24,9 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
static GList *layer_widgets = NULL; static GtkWidget *global_load_button;
static GtkWidget *load_button; static GtkWidget *global_save_button;
static GtkWidget *save_button; static GtkListBox *global_list_box;
static void delete_layer_widget(GtkWidget *widget) static void delete_layer_widget(GtkWidget *widget)
{ {
@ -50,19 +50,23 @@ GList *export_rendered_layer_info()
GList *info_list = NULL; GList *info_list = NULL;
LayerElement *le; LayerElement *le;
struct layer_info *linfo; struct layer_info *linfo;
GList *widget_list; GList *row_list;
GList *temp;
int i;
row_list = gtk_container_get_children(GTK_CONTAINER(global_list_box));
/* Iterate through widgets and add layers that shall be exported */ /* Iterate through widgets and add layers that shall be exported */
for (widget_list = layer_widgets; widget_list != NULL; widget_list = widget_list->next) { for (i = 0, temp = row_list; temp != NULL; temp = temp->next, i++) {
le = LAYER_ELEMENT(widget_list->data); le = LAYER_ELEMENT(temp->data);
if (layer_element_get_export(le) == TRUE) { if (layer_element_get_export(le) == TRUE) {
/* Allocate new info and fill with info */ /* Allocate new info and fill with info */
linfo = (struct layer_info *)malloc(sizeof(struct layer_info)); linfo = (struct layer_info *)malloc(sizeof(struct layer_info));
layer_element_get_color(le, &linfo->color); layer_element_get_color(le, &linfo->color);
linfo->layer = layer_element_get_layer(le); linfo->layer = layer_element_get_layer(le);
linfo->stacked_position = layer_element_get_stack(le); linfo->stacked_position = i;
/* Append to list */ /* Append to list */
info_list = g_list_append(info_list, (gpointer)linfo); info_list = g_list_append(info_list, (gpointer)linfo);
@ -75,32 +79,39 @@ GList *export_rendered_layer_info()
void clear_list_box_widgets(GtkListBox *box) void clear_list_box_widgets(GtkListBox *box)
{ {
GList *list; GList *list;
GList *temp;
list = gtk_container_get_children(GTK_CONTAINER(box)); list = gtk_container_get_children(GTK_CONTAINER(box));
for (;list != NULL; list = list->next) { for (temp = list; temp != NULL; temp = temp->next) {
gtk_container_remove(GTK_CONTAINER(box), GTK_WIDGET(list->data)); gtk_container_remove(GTK_CONTAINER(box), GTK_WIDGET(temp->data));
} }
/* Widgets are already destroyed when removed from box because they are only referenced inside the container */ /* Widgets are already destroyed when removed from box because they are only referenced inside the container */
g_list_free(layer_widgets);
layer_widgets = NULL; g_list_free(list);
/* Deactivate buttons */ /* Deactivate buttons */
gtk_widget_set_sensitive(load_button, FALSE); gtk_widget_set_sensitive(global_load_button, FALSE);
gtk_widget_set_sensitive(save_button, FALSE); gtk_widget_set_sensitive(global_save_button, FALSE);
} }
static gboolean check_if_layer_widget_exists(int layer) { static gboolean check_if_layer_widget_exists(int layer) {
GList *list; GList *list;
GList *temp;
LayerElement *widget; LayerElement *widget;
gboolean ret = FALSE; gboolean ret = FALSE;
for (list = layer_widgets; list != NULL; list = list->next) { list = gtk_container_get_children(GTK_CONTAINER(global_list_box));
widget = (LayerElement *)list->data;
for (temp = list; temp != NULL; temp = temp->next) {
widget = LAYER_ELEMENT(temp->data);
if (layer_element_get_layer(widget) == layer) { if (layer_element_get_layer(widget) == layer) {
ret = TRUE; ret = TRUE;
break; break;
} }
} }
g_list_free(list);
return ret; return ret;
} }
@ -117,31 +128,22 @@ static void analyze_cell_layers(GtkListBox *listbox, struct gds_cell *cell)
if (check_if_layer_widget_exists(layer) == FALSE) { if (check_if_layer_widget_exists(layer) == FALSE) {
le = layer_element_new(); le = layer_element_new();
layer_element_set_layer(LAYER_ELEMENT(le), layer); layer_element_set_layer(LAYER_ELEMENT(le), layer);
layer_element_set_stack(LAYER_ELEMENT(le), layer);
gtk_list_box_insert(listbox, le, -1); gtk_list_box_insert(listbox, le, -1);
gtk_widget_show(le); gtk_widget_show(le);
layer_widgets = g_list_append(layer_widgets, le);
} }
} }
} }
gint sort_func(GtkListBoxRow *row1, GtkListBoxRow *row2, gpointer unused) gint sort_func(GtkListBoxRow *row1, GtkListBoxRow *row2, gpointer unused)
{ {
GList *children1, *children2;
LayerElement *le1, *le2; LayerElement *le1, *le2;
gint ret; gint ret;
children1 = gtk_container_get_children(GTK_CONTAINER(row1)); le1 = LAYER_ELEMENT(row1);
children2 = gtk_container_get_children(GTK_CONTAINER(row2)); le2 = LAYER_ELEMENT(row2);
le1 = LAYER_ELEMENT(children1->data);
le2 = LAYER_ELEMENT(children2->data);
ret = layer_element_get_layer(le1) - layer_element_get_layer(le2); ret = layer_element_get_layer(le1) - layer_element_get_layer(le2);
g_list_free(children1);
g_list_free(children2);
return ret; return ret;
} }
@ -150,6 +152,8 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
GList *cell_list = NULL; GList *cell_list = NULL;
struct gds_library *lib; struct gds_library *lib;
global_list_box = listbox;
clear_list_box_widgets(listbox); clear_list_box_widgets(listbox);
gtk_list_box_set_sort_func(listbox, sort_func, NULL, NULL); gtk_list_box_set_sort_func(listbox, sort_func, NULL, NULL);
@ -163,9 +167,12 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
/* Force sort */ /* Force sort */
gtk_list_box_invalidate_sort(listbox); gtk_list_box_invalidate_sort(listbox);
/* Disable sort, so user can sort layers */
gtk_list_box_set_sort_func(listbox, NULL, NULL, NULL);
/* Activate Buttons */ /* Activate Buttons */
gtk_widget_set_sensitive(load_button, TRUE); gtk_widget_set_sensitive(global_load_button, TRUE);
gtk_widget_set_sensitive(save_button, TRUE); gtk_widget_set_sensitive(global_save_button, TRUE);
} }
/** /**
@ -178,7 +185,7 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
* @param opacity * @param opacity
* @return 0 if succesfull, 1 if line was malformatted or parameters are broken, -1 if file end * @return 0 if succesfull, 1 if line was malformatted or parameters are broken, -1 if file end
*/ */
static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, int *target_layer, GdkRGBA *color) static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name, int *layer, GdkRGBA *color)
{ {
int ret; int ret;
gsize len; gsize len;
@ -192,7 +199,7 @@ static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name
goto ret_direct; goto ret_direct;
} }
regex = g_regex_new("^(?<layer>[0-9]+),(?<target>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL); regex = g_regex_new("^(?<layer>[0-9]+),(?<r>[0-9\\.]+),(?<g>[0-9\\.]+),(?<b>[0-9\\.]+),(?<a>[0-9\\.]+),(?<export>[01]),(?<name>.*)$", 0, 0, NULL);
line = g_data_input_stream_read_line(stream, &len, NULL, NULL); line = g_data_input_stream_read_line(stream, &len, NULL, NULL);
if (!line) { if (!line) {
@ -207,9 +214,6 @@ static int load_csv_line(GDataInputStream *stream, gboolean *export, char **name
match = g_match_info_fetch_named(mi, "layer"); match = g_match_info_fetch_named(mi, "layer");
*layer = (int)g_ascii_strtoll(match, NULL, 10); *layer = (int)g_ascii_strtoll(match, NULL, 10);
g_free(match); g_free(match);
match = g_match_info_fetch_named(mi, "target");
*target_layer = (int)g_ascii_strtoll(match, NULL, 10);
g_free(match);
match = g_match_info_fetch_named(mi, "r"); match = g_match_info_fetch_named(mi, "r");
color->red = g_ascii_strtod(match, NULL); color->red = g_ascii_strtod(match, NULL);
g_free(match); g_free(match);
@ -244,28 +248,23 @@ ret_direct:
} }
static LayerElement *find_layer_in_list(GList *list, int layer) static LayerElement *find_layer_element_in_list(GList *el_list, int layer)
{ {
LayerElement *le_found, *temp; LayerElement *ret = NULL;
for (; el_list != NULL; el_list = el_list->next) {
for (le_found = NULL; list != NULL; list = list->next) { if (layer_element_get_layer(LAYER_ELEMENT(el_list->data)) == layer) {
temp = LAYER_ELEMENT(list->data); ret = LAYER_ELEMENT(el_list->data);
if (layer_element_get_layer(temp) == layer) {
le_found = temp;
break; break;
} }
} }
return ret;
return le_found;
} }
static void load_layer_mapping_from_file(gchar *file_name) static void load_layer_mapping_from_file(gchar *file_name)
{ {
GFile *file; GFile *file;
GFileInputStream *stream; GFileInputStream *stream;
GDataInputStream *dstream; GDataInputStream *dstream;
LayerElement *le; LayerElement *le;
char *name; char *name;
gboolean export; gboolean export;
@ -273,6 +272,8 @@ static void load_layer_mapping_from_file(gchar *file_name)
int target_layer; int target_layer;
GdkRGBA color; GdkRGBA color;
int result; int result;
GList *rows;
GList *temp;
file = g_file_new_for_path(file_name); file = g_file_new_for_path(file_name);
stream = g_file_read(file, NULL, NULL); stream = g_file_read(file, NULL, NULL);
@ -282,21 +283,48 @@ static void load_layer_mapping_from_file(gchar *file_name)
dstream = g_data_input_stream_new(G_INPUT_STREAM(stream)); dstream = g_data_input_stream_new(G_INPUT_STREAM(stream));
while((result = load_csv_line(dstream, &export, &name, &layer, &target_layer, &color)) >= 0) { rows = gtk_container_get_children(GTK_CONTAINER(global_list_box));
/* Reference and remove all rows from box */
for (temp = rows; temp != NULL; temp = temp->next) {
le = LAYER_ELEMENT(temp->data);
/* Referencing protets the widget from being deleted when removed */
g_object_ref(G_OBJECT(le));
gtk_container_remove(GTK_CONTAINER(global_list_box), GTK_WIDGET(le));
}
target_layer = 0;
while((result = load_csv_line(dstream, &export, &name, &layer, &color)) >= 0) {
/* skip broken line */ /* skip broken line */
if (result == 1) if (result == 1)
continue; continue;
/* search for layer widget */ /* Add rows in the same order as in file */
if (le = find_layer_in_list(layer_widgets, layer)) { if (le = find_layer_element_in_list(rows, layer)) {
layer_element_set_name(le, name); gtk_list_box_insert(global_list_box, GTK_WIDGET(le), -1);
layer_element_set_color(le, &color); layer_element_set_color(le, &color);
layer_element_set_export(le, export); layer_element_set_export(le, export);
layer_element_set_stack(le, target_layer); layer_element_set_name(le, name);
/* Dereference and remove from list */
g_object_unref(G_OBJECT(le));
rows = g_list_remove(rows, le);
} }
g_free(name);
} }
/* Add remaining elements */
for (temp = rows; temp != NULL; temp = temp->next) {
le = LAYER_ELEMENT(temp->data);
/* Referencing protets the widget from being deleted when removed */
gtk_list_box_insert(global_list_box, GTK_WIDGET(le), -1);
g_object_unref(G_OBJECT(le));
}
/* Delete list */
g_list_free(rows);
/* read line */ /* read line */
g_object_unref(dstream); g_object_unref(dstream);
g_object_unref(stream); g_object_unref(stream);
@ -327,7 +355,6 @@ static void create_csv_line(LayerElement *layer_element, char *line_buffer, size
gboolean export; gboolean export;
const gchar *name; const gchar *name;
int layer; int layer;
int target_layer;
GdkRGBA color; GdkRGBA color;
string = g_string_new_len(NULL, max_len-1); string = g_string_new_len(NULL, max_len-1);
@ -336,12 +363,12 @@ static void create_csv_line(LayerElement *layer_element, char *line_buffer, size
export = layer_element_get_export(layer_element); export = layer_element_get_export(layer_element);
name = (const gchar*)layer_element_get_name(layer_element); name = (const gchar*)layer_element_get_name(layer_element);
layer = layer_element_get_layer(layer_element); layer = layer_element_get_layer(layer_element);
target_layer = layer_element_get_stack(layer_element);
layer_element_get_color(layer_element, &color); layer_element_get_color(layer_element, &color);
printf("Foo\n");
/* print values to line */ /* print values to line */
g_string_printf(string, "%d,%d,%lf,%lf,%lf,%lf,%d,%s\n", g_string_printf(string, "%d,%lf,%lf,%lf,%lf,%d,%s\n",
layer, target_layer, color.red, color.green, layer, color.red, color.green,
color.blue, color.alpha, (export == TRUE ? 1 : 0), name); color.blue, color.alpha, (export == TRUE ? 1 : 0), name);
if (string->len > (max_len-1)) { if (string->len > (max_len-1)) {
@ -358,23 +385,28 @@ static void create_csv_line(LayerElement *layer_element, char *line_buffer, size
g_string_free(string, TRUE); g_string_free(string, TRUE);
} }
static void save_layer_mapping_data(const gchar *file_name) static void save_layer_mapping_data(const gchar *file_name, GtkListBox *list_box)
{ {
FILE *file; FILE *file;
char workbuff[512]; char workbuff[512];
GList *le_list; GList *le_list;
GList *temp;
/* Overwrite existing file */ /* Overwrite existing file */
file = fopen((const char *)file_name, "w"); file = fopen((const char *)file_name, "w");
/* File format is CSV: <Layer>,<target_layer>,<R>,<G>,<B>,<Alpha>,<Export?>,<Name> */ le_list = gtk_container_get_children(GTK_CONTAINER(list_box));
for (le_list = layer_widgets; le_list != NULL; le_list = le_list->next) {
/* File format is CSV: <Layer>,<target_pos>,<R>,<G>,<B>,<Alpha>,<Export?>,<Name> */
for (temp = le_list; temp != NULL; temp = temp->next) {
/* To be sure it is a valid string */ /* To be sure it is a valid string */
workbuff[0] = 0; workbuff[0] = 0;
create_csv_line((LayerElement *)le_list->data, workbuff, sizeof(workbuff)); create_csv_line(LAYER_ELEMENT(temp->data), workbuff, sizeof(workbuff));
fwrite(workbuff, sizeof(char), strlen(workbuff), file); fwrite(workbuff, sizeof(char), strlen(workbuff), file);
} }
g_list_free(le_list);
/* Save File */ /* Save File */
fflush(file); fflush(file);
fclose(file); fclose(file);
@ -391,7 +423,7 @@ static void save_mapping_clicked(GtkWidget *button, gpointer user_data)
res = gtk_dialog_run(GTK_DIALOG(dialog)); res = gtk_dialog_run(GTK_DIALOG(dialog));
if (res == GTK_RESPONSE_ACCEPT) { if (res == GTK_RESPONSE_ACCEPT) {
file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
save_layer_mapping_data(file_name); save_layer_mapping_data(file_name, global_list_box);
g_free(file_name); g_free(file_name);
} }
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
@ -400,13 +432,13 @@ static void save_mapping_clicked(GtkWidget *button, gpointer user_data)
void setup_load_mapping_callback(GtkWidget *button, GtkWindow *main_window) void setup_load_mapping_callback(GtkWidget *button, GtkWindow *main_window)
{ {
g_object_ref(G_OBJECT(button)); g_object_ref(G_OBJECT(button));
load_button = button; global_load_button = button;
g_signal_connect(button, "clicked", G_CALLBACK(load_mapping_clicked), main_window); g_signal_connect(button, "clicked", G_CALLBACK(load_mapping_clicked), main_window);
} }
void setup_save_mapping_callback(GtkWidget *button, GtkWindow *main_window) void setup_save_mapping_callback(GtkWidget *button, GtkWindow *main_window)
{ {
g_object_ref(G_OBJECT(button)); g_object_ref(G_OBJECT(button));
save_button = button; global_save_button = button;
g_signal_connect(button, "clicked", G_CALLBACK(save_mapping_clicked), main_window); g_signal_connect(button, "clicked", G_CALLBACK(save_mapping_clicked), main_window);
} }

104
layer-widget/layer-element.c
View File

@ -19,7 +19,7 @@
#include "layer-element.h" #include "layer-element.h"
G_DEFINE_TYPE(LayerElement, layer_element, GTK_TYPE_BOX) G_DEFINE_TYPE(LayerElement, layer_element, GTK_TYPE_LIST_BOX_ROW)
static void layer_element_dispose(GObject *obj) static void layer_element_dispose(GObject *obj)
{ {
@ -39,23 +39,98 @@ static void layer_element_class_init(LayerElementClass *klass)
oclass->constructed = layer_element_constructed; oclass->constructed = layer_element_constructed;
} }
static GtkTargetEntry entries[] = {
{ "GTK_LIST_BOX_ROW", GTK_TARGET_SAME_APP, 0 }
};
static void layer_element_drag_begin(GtkWidget *widget,
GdkDragContext *context,
gpointer data)
{
GtkWidget *row;
GtkAllocation alloc;
cairo_surface_t *surface;
cairo_t *cr;
int x, y;
row = gtk_widget_get_ancestor (widget, GTK_TYPE_LIST_BOX_ROW);
gtk_widget_get_allocation (row, &alloc);
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, alloc.width, alloc.height);
cr = cairo_create (surface);
gtk_style_context_add_class (gtk_widget_get_style_context (row), "drag-icon");
gtk_widget_draw (row, cr);
gtk_style_context_remove_class (gtk_widget_get_style_context (row), "drag-icon");
gtk_widget_translate_coordinates (widget, row, 0, 0, &x, &y);
cairo_surface_set_device_offset (surface, -x, -y);
gtk_drag_set_icon_surface (context, surface);
cairo_destroy (cr);
cairo_surface_destroy (surface);
}
static void layer_element_drag_data_get(GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
guint time,
gpointer data)
{
gtk_selection_data_set(selection_data, gdk_atom_intern_static_string("GTK_LIST_BOX_ROW"),
32, (const guchar *)&widget, sizeof(gpointer));
}
static void layer_element_drag_data_received(GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
GtkSelectionData *selection_data,
guint info,
guint32 time,
gpointer data)
{
GtkWidget *target;
GtkWidget *row;
GtkWidget *source;
int pos;
target = widget;
pos = gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (target));
row = (gpointer) *(gpointer *)gtk_selection_data_get_data (selection_data);
source = gtk_widget_get_ancestor (row, GTK_TYPE_LIST_BOX_ROW);
if (source == target)
return;
g_object_ref (source);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (source)), source);
gtk_list_box_insert (GTK_LIST_BOX (gtk_widget_get_parent (target)), source, pos);
g_object_unref (source);
}
static void layer_element_init(LayerElement *self) static void layer_element_init(LayerElement *self)
{ {
GtkBuilder *builder; GtkBuilder *builder;
GtkWidget *glade_box; GtkWidget *glade_box;
builder = gtk_builder_new_from_resource("/layer-widget.glade"); builder = gtk_builder_new_from_resource("/layer-widget.glade");
glade_box = GTK_WIDGET(gtk_builder_get_object(builder, "box")); glade_box = GTK_WIDGET(gtk_builder_get_object(builder, "box"));
gtk_box_pack_start(GTK_BOX(self), glade_box, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(self), glade_box);
/* Get Elements */ /* Get Elements */
self->priv.color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "color")); self->priv.color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "color"));
self->priv.export = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "export")); self->priv.export = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "export"));
self->priv.layer = GTK_LABEL(gtk_builder_get_object(builder, "layer")); self->priv.layer = GTK_LABEL(gtk_builder_get_object(builder, "layer"));
self->priv.name = GTK_ENTRY(gtk_builder_get_object(builder, "entry")); self->priv.name = GTK_ENTRY(gtk_builder_get_object(builder, "entry"));
self->priv.stack = GTK_ENTRY(gtk_builder_get_object(builder, "entry-stack")); self->priv.event_handle = GTK_EVENT_BOX(gtk_builder_get_object(builder, "event-box"));
/* Connect signals */ /* Setup drag and drop */
/* None */ gtk_drag_source_set(GTK_WIDGET(self->priv.event_handle), GDK_BUTTON1_MASK, entries, 1, GDK_ACTION_MOVE);
g_signal_connect(self->priv.event_handle, "drag-begin", G_CALLBACK(layer_element_drag_begin), NULL);
g_signal_connect(self->priv.event_handle, "drag-data-get", G_CALLBACK(layer_element_drag_data_get), NULL);
gtk_drag_dest_set(GTK_WIDGET(self), GTK_DEST_DEFAULT_ALL, entries, 1, GDK_ACTION_MOVE);
g_signal_connect(GTK_WIDGET(self), "drag-data-received", G_CALLBACK(layer_element_drag_data_received), NULL);
g_object_unref(builder); g_object_unref(builder);
} }
@ -91,25 +166,6 @@ int layer_element_get_layer(LayerElement *elem)
return elem->priv.layer_num; return elem->priv.layer_num;
} }
void layer_element_set_stack(LayerElement *elem, int layer)
{
GString *string;
string = g_string_new_len(NULL, 20);
g_string_printf(string, "%d", layer);
gtk_entry_set_text(elem->priv.stack, (const gchar *)string->str);
g_string_free(string, TRUE);
}
int layer_element_get_stack(LayerElement *elem)
{
const char *txt;
txt = gtk_entry_get_text(elem->priv.stack);
return (int)g_ascii_strtoll(txt, NULL, 10);
}
void layer_element_set_export(LayerElement *elem, gboolean export) void layer_element_set_export(LayerElement *elem, gboolean export)
{ {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(elem->priv.export), export); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(elem->priv.export), export);

10
layer-widget/layer-element.h
View File

@ -25,7 +25,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
/* Creates Class structure etc */ /* Creates Class structure etc */
G_DECLARE_FINAL_TYPE(LayerElement, layer_element, LAYER, ELEMENT, GtkBox) G_DECLARE_FINAL_TYPE(LayerElement, layer_element, LAYER, ELEMENT, GtkListBoxRow)
#define TYPE_LAYER_ELEMENT (layer_element_get_type()) #define TYPE_LAYER_ELEMENT (layer_element_get_type())
@ -33,14 +33,14 @@ typedef struct _LayerElementPriv {
GtkEntry *name; GtkEntry *name;
GtkLabel *layer; GtkLabel *layer;
int layer_num; int layer_num;
GtkEventBox *event_handle;
GtkColorButton *color; GtkColorButton *color;
GtkCheckButton *export; GtkCheckButton *export;
GtkEntry *stack;
} LayerElementPriv; } LayerElementPriv;
typedef struct _LayerElement { typedef struct _LayerElement {
/* Inheritance */ /* Inheritance */
GtkBox hbox; GtkListBoxRow parent;
/* Custom Elements */ /* Custom Elements */
LayerElementPriv priv; LayerElementPriv priv;
} LayerElement; } LayerElement;
@ -51,10 +51,6 @@ const char *layer_element_get_name(LayerElement *elem);
void layer_element_set_name(LayerElement *elem, const char* name); void layer_element_set_name(LayerElement *elem, const char* name);
void layer_element_set_layer(LayerElement *elem, int layer); void layer_element_set_layer(LayerElement *elem, int layer);
int layer_element_get_layer(LayerElement *elem); int layer_element_get_layer(LayerElement *elem);
void layer_element_set_stack(LayerElement *elem, int layer);
int layer_element_get_stack(LayerElement *elem);
void layer_element_set_export(LayerElement *elem, gboolean export); void layer_element_set_export(LayerElement *elem, gboolean export);
gboolean layer_element_get_export(LayerElement *elem); gboolean layer_element_get_export(LayerElement *elem);
void layer_element_get_color(LayerElement *elem, GdkRGBA *rgba); void layer_element_get_color(LayerElement *elem, GdkRGBA *rgba);