[Pkg-e-commits] [SCM] Enlightenment DR17 toolkit based (based on the EFL) branch, upstream-vcs, updated. 447de88121d145a078f1754a0cfebb704d363821

pfritz pfritz at alioth.debian.org
Sat Jun 7 18:34:23 UTC 2008


The following commit has been merged in the upstream-vcs branch:
commit 1327ff7dfd20d624015e920cdb5eef6d50013702
Author: pfritz <pfritz>
Date:   Tue Apr 29 23:10:19 2008 +0000

    use the correct paths

diff --git a/src/bin/tests/list/Makefile.am b/src/bin/tests/list/Makefile.am
index fbfb184..2a94bd9 100644
--- a/src/bin/tests/list/Makefile.am
+++ b/src/bin/tests/list/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -I$(top_srcdir)/src/bin \
 -I$(top_builddir)/src/bin \
+-DPACKAGE_DATA_DIR=\"$(datadir)\" \
 @EDJE_CFLAGS@ \
 @ECORE_CFLAGS@ \
 @EVAS_CFLAGS@ \
diff --git a/src/bin/tests/list/ewl_list_test.c b/src/bin/tests/list/ewl_list_test.c
index a9bce7f..3a8d856 100644
--- a/src/bin/tests/list/ewl_list_test.c
+++ b/src/bin/tests/list/ewl_list_test.c
@@ -60,6 +60,7 @@ create_test(Ewl_Container *box)
 	/* create a list using an ecore_list of strings of labels */
 	o = ewl_border_new();
 	ewl_border_label_set(EWL_BORDER(o), "Label List (single select)");
+	ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_HFILL);
 	ewl_container_child_append(EWL_CONTAINER(box), o);
 	ewl_widget_show(o);
 
@@ -85,6 +86,7 @@ create_test(Ewl_Container *box)
 	/* create a list using an ecore_list of strings of labels */
 	o = ewl_border_new();
 	ewl_border_label_set(EWL_BORDER(o), "Label List (multi select)");
+	ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_HFILL);
 	ewl_container_child_append(EWL_CONTAINER(box), o);
 	ewl_widget_show(o);
 
@@ -139,15 +141,15 @@ list_test_data_setup(void)
 	data->rows = calloc(3, sizeof(List_Test_Row_Data *));
 
 	data->rows[0] = calloc(1, sizeof(List_Test_Row_Data));
-	data->rows[0]->image = strdup("/usr/local/share/ewl/e-logo.png");
+	data->rows[0]->image = strdup(PACKAGE_DATA_DIR"/ewl/images/e-logo.png");
 	data->rows[0]->text = strdup("The E logo");
 
 	data->rows[1] = calloc(1, sizeof(List_Test_Row_Data));
-	data->rows[1]->image = strdup("/usr/local/share/ewl/entice.png");
+	data->rows[1]->image = strdup(PACKAGE_DATA_DIR"/ewl/images/entice.png");
 	data->rows[1]->text = strdup("The Entice image");
 
 	data->rows[2] = calloc(1, sizeof(List_Test_Row_Data));
-	data->rows[2]->image = strdup("/usr/local/share/entrance.png");
+	data->rows[2]->image = strdup(PACKAGE_DATA_DIR"/ewl/images/entrance.png");
 	data->rows[2]->text = strdup("The Entrance image");
 
 	data->count = 3;
@@ -167,6 +169,7 @@ list_test_cb_widget_fetch(void *data, unsigned int row __UNUSED__,
 	w = ewl_button_new();
 	ewl_button_label_set(EWL_BUTTON(w), d->text);
 	ewl_button_image_set(EWL_BUTTON(w), d->image, NULL);
+	ewl_button_image_size_set(EWL_BUTTON(w), 24, 24);
 	ewl_widget_show(w);
 
 	return w;

-- 
Enlightenment DR17 toolkit based (based on the EFL)



More information about the Pkg-e-commits mailing list