summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin (Beber) <beber@setibzh.com>2006-01-23 16:08:26 +0100
committerBertrand Jacquin (Beber) <beber@setibzh.com>2006-01-23 16:08:26 +0100
commitfc08e61119c46558ad5a9f78b99819d2eb53ebce (patch)
tree7c063560090ecbb8062b3553fe1c160c3c2dace6
parentdel BINAIRE ! (diff)
downloadepresent-fc08e61119c46558ad5a9f78b99819d2eb53ebce.tar.gz
tb2
-rw-r--r--main.h1
-rw-r--r--slide.c39
2 files changed, 29 insertions, 11 deletions
diff --git a/main.h b/main.h
index 4baf57b..e7853f5 100644
--- a/main.h
+++ b/main.h
@@ -14,6 +14,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <string.h>
#include "xtag.h"
#include "slide.h"
diff --git a/slide.c b/slide.c
index 1c88d04..a0f1d49 100644
--- a/slide.c
+++ b/slide.c
@@ -253,10 +253,15 @@ _smart_reconfigure(Smart_Data *sd)
"Vera-Bold",
(int)sd->h / 16);
evas_object_textblock_clear(si->obj);
- evas_object_textblock_format_insert(si->obj, buf);
- evas_object_textblock_text_insert(si->obj, si->text);
+// evas_object_textblock_format_insert(si->obj, buf);
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 1);
+ strcat (si->obj, buf);
+// evas_object_textblock_text_insert(si->obj, si->text);
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 1);
+ strcat (si->obj, si->text);
evas_object_resize(si->obj, sd->w, 1);
- evas_object_textblock_format_size_get(si->obj, &w, &h);
+// evas_object_textblock_format_size_get(si->obj, &w, &h);
+// edje_extern_object_min_size_set(si->obj, w, h);
w = sd->w;
padjust = 0;
}
@@ -269,10 +274,15 @@ _smart_reconfigure(Smart_Data *sd)
"Vera",
(int)sd->h / 24);
evas_object_textblock_clear(si->obj);
- evas_object_textblock_format_insert(si->obj, buf);
- evas_object_textblock_text_insert(si->obj, si->text);
+// evas_object_textblock_format_insert(si->obj, buf);
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 1);
+ strcat (si->obj, buf);
+// evas_object_textblock_text_insert(si->obj, si->text);
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 1);
+ strcat (si->obj, si->text);
evas_object_resize(si->obj, sd->w, 1);
- evas_object_textblock_format_size_get(si->obj, &w, &h);
+// evas_object_textblock_format_size_get(si->obj, &w, &h);
+// edje_extern_object_min_size_set(si->obj, w, h);
w = sd->w;
padjust = 0;
}
@@ -347,12 +357,19 @@ _smart_reconfigure(Smart_Data *sd)
"Vera",
(int)sd->h / 24);
evas_object_textblock_clear(si->obj);
- evas_object_textblock_format_insert(si->obj, buf);
- evas_object_textblock_format_insert(si->obj, "\t");
- evas_object_textblock_text_insert(si->obj, "* ");
- evas_object_textblock_text_insert(si->obj, si->text);
+// evas_object_textblock_format_insert(si->obj, buf);
+// evas_object_textblock_format_insert(si->obj, "\t");
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 2);
+ strcat (si->obj, buf);
+ strcat (si->obj, "\t");
+// evas_object_textblock_text_insert(si->obj, "* ");
+// evas_object_textblock_text_insert(si->obj, si->text);
+ si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 3);
+ strcat (si->obj, "* ");
+ strcat (si->obj, si->text);
evas_object_resize(si->obj, sd->w, 1);
- evas_object_textblock_format_size_get(si->obj, &w, &h);
+// evas_object_textblock_format_size_get(si->obj, &w, &h);
+// edje_extern_object_min_size_set(si->obj, w, h);
w = sd->w;
padjust = -(sd->h / 40);
}