summaryrefslogtreecommitdiff
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
parentd1691cb96f0b6fb4bc675ec0eac2b95842aea083 (diff)
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 @@
14#include <sys/types.h> 14#include <sys/types.h>
15#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/types.h> 16#include <sys/types.h>
17#include <string.h>
17 18
18#include "xtag.h" 19#include "xtag.h"
19#include "slide.h" 20#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)
253 "Vera-Bold", 253 "Vera-Bold",
254 (int)sd->h / 16); 254 (int)sd->h / 16);
255 evas_object_textblock_clear(si->obj); 255 evas_object_textblock_clear(si->obj);
256 evas_object_textblock_format_insert(si->obj, buf); 256// evas_object_textblock_format_insert(si->obj, buf);
257 evas_object_textblock_text_insert(si->obj, si->text); 257 si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 1);
258 strcat (si->obj, buf);
259// evas_object_textblock_text_insert(si->obj, si->text);
260 si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 1);
261 strcat (si->obj, si->text);
258 evas_object_resize(si->obj, sd->w, 1); 262 evas_object_resize(si->obj, sd->w, 1);
259 evas_object_textblock_format_size_get(si->obj, &w, &h); 263// evas_object_textblock_format_size_get(si->obj, &w, &h);
264// edje_extern_object_min_size_set(si->obj, w, h);
260 w = sd->w; 265 w = sd->w;
261 padjust = 0; 266 padjust = 0;
262 } 267 }
@@ -269,10 +274,15 @@ _smart_reconfigure(Smart_Data *sd)
269 "Vera", 274 "Vera",
270 (int)sd->h / 24); 275 (int)sd->h / 24);
271 evas_object_textblock_clear(si->obj); 276 evas_object_textblock_clear(si->obj);
272 evas_object_textblock_format_insert(si->obj, buf); 277// evas_object_textblock_format_insert(si->obj, buf);
273 evas_object_textblock_text_insert(si->obj, si->text); 278 si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 1);
279 strcat (si->obj, buf);
280// evas_object_textblock_text_insert(si->obj, si->text);
281 si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 1);
282 strcat (si->obj, si->text);
274 evas_object_resize(si->obj, sd->w, 1); 283 evas_object_resize(si->obj, sd->w, 1);
275 evas_object_textblock_format_size_get(si->obj, &w, &h); 284// evas_object_textblock_format_size_get(si->obj, &w, &h);
285// edje_extern_object_min_size_set(si->obj, w, h);
276 w = sd->w; 286 w = sd->w;
277 padjust = 0; 287 padjust = 0;
278 } 288 }
@@ -347,12 +357,19 @@ _smart_reconfigure(Smart_Data *sd)
347 "Vera", 357 "Vera",
348 (int)sd->h / 24); 358 (int)sd->h / 24);
349 evas_object_textblock_clear(si->obj); 359 evas_object_textblock_clear(si->obj);
350 evas_object_textblock_format_insert(si->obj, buf); 360// evas_object_textblock_format_insert(si->obj, buf);
351 evas_object_textblock_format_insert(si->obj, "\t"); 361// evas_object_textblock_format_insert(si->obj, "\t");
352 evas_object_textblock_text_insert(si->obj, "* "); 362 si->obj = realloc(si->obj, strlen (si->obj) + strlen(buf) + 2);
353 evas_object_textblock_text_insert(si->obj, si->text); 363 strcat (si->obj, buf);
364 strcat (si->obj, "\t");
365// evas_object_textblock_text_insert(si->obj, "* ");
366// evas_object_textblock_text_insert(si->obj, si->text);
367 si->obj = realloc(si->obj, strlen (si->obj) + strlen(si->text) + 3);
368 strcat (si->obj, "* ");
369 strcat (si->obj, si->text);
354 evas_object_resize(si->obj, sd->w, 1); 370 evas_object_resize(si->obj, sd->w, 1);
355 evas_object_textblock_format_size_get(si->obj, &w, &h); 371// evas_object_textblock_format_size_get(si->obj, &w, &h);
372// edje_extern_object_min_size_set(si->obj, w, h);
356 w = sd->w; 373 w = sd->w;
357 padjust = -(sd->h / 40); 374 padjust = -(sd->h / 40);
358 } 375 }