DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harmonize the "tasks" data structure in embedded mode

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-01 21:46:07 +02:00
parent c7921be51c
commit af947b48b2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/applets/tasks.c
View File

@ -48,9 +48,7 @@ typedef struct _Task
Window window; Window window;
GtkWidget * widget; GtkWidget * widget;
GtkWidget * image; GtkWidget * image;
#ifndef EMBEDDED
GtkWidget * label; GtkWidget * label;
#endif
gboolean delete; gboolean delete;
} Task; } Task;
@ -190,18 +188,20 @@ static Task * _task_new(Tasks * tasks, Window window, char const * name,
gtk_box_pack_start(GTK_BOX(hbox), task->image, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), task->image, FALSE, TRUE, 0);
#ifndef EMBEDDED #ifndef EMBEDDED
task->label = gtk_label_new(name); task->label = gtk_label_new(name);
#if 0 /* FIXME doesn't seem to work properly */ # if 0 /* FIXME doesn't seem to work properly */
gtk_label_set_ellipsize(GTK_LABEL(task->label), PANGO_ELLIPSIZE_END); gtk_label_set_ellipsize(GTK_LABEL(task->label), PANGO_ELLIPSIZE_END);
#endif # endif
if(task->tasks->iconsize == GTK_ICON_SIZE_LARGE_TOOLBAR) if(task->tasks->iconsize == GTK_ICON_SIZE_LARGE_TOOLBAR)
gtk_label_set_line_wrap(GTK_LABEL(task->label), TRUE); gtk_label_set_line_wrap(GTK_LABEL(task->label), TRUE);
#if GTK_CHECK_VERSION(2, 10, 0) # if GTK_CHECK_VERSION(2, 10, 0)
gtk_label_set_line_wrap_mode(GTK_LABEL(task->label), gtk_label_set_line_wrap_mode(GTK_LABEL(task->label),
PANGO_WRAP_WORD_CHAR); PANGO_WRAP_WORD_CHAR);
#endif # endif
gtk_box_pack_start(GTK_BOX(hbox), task->label, FALSE, TRUE, 4); gtk_box_pack_start(GTK_BOX(hbox), task->label, FALSE, TRUE, 4);
gtk_widget_set_size_request(task->widget, tasks->icon_width, gtk_widget_set_size_request(task->widget, tasks->icon_width,
tasks->icon_height); tasks->icon_height);
#else
task->label = NULL;
#endif #endif
gtk_container_add(GTK_CONTAINER(task->widget), hbox); gtk_container_add(GTK_CONTAINER(task->widget), hbox);
_task_set(task, name, pixbuf); _task_set(task, name, pixbuf);
@ -221,9 +221,8 @@ static void _task_delete(Task * task)
/* task_set */ /* task_set */
static void _task_set(Task * task, char const * name, GdkPixbuf * pixbuf) static void _task_set(Task * task, char const * name, GdkPixbuf * pixbuf)
{ {
#ifndef EMBEDDED if(task->label != NULL)
gtk_label_set_text(GTK_LABEL(task->label), name); gtk_label_set_text(GTK_LABEL(task->label), name);
#endif
#if GTK_CHECK_VERSION(2, 12, 0) #if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_tooltip_text(task->widget, name); gtk_widget_set_tooltip_text(task->widget, name);
#endif #endif