Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text_context.c
Log Message:
- fix wrap and align issues of the text widget
- bg color works now for the text
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text_context.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_text_context.c 7 May 2008 13:38:25 -0000 1.11
+++ ewl_text_context.c 28 Jun 2008 10:02:31 -0000 1.12
@@ -439,9 +439,16 @@
fmt[pos].val = t;
fmt[pos++].free = TRUE;
- fmt[pos].key = "backing_color";
- fmt[pos].val =
ewl_text_context_color_string_get(&(ctx->style_colors.bg));
- fmt[pos++].free = TRUE;
+ if (ctx->style_colors.bg.a)
+ {
+ fmt[pos].key = "backing";
+ fmt[pos].val = "on";
+ fmt[pos++].free = FALSE;
+
+ fmt[pos].key = "backing_color";
+ fmt[pos].val =
ewl_text_context_color_string_get(&(ctx->style_colors.bg));
+ fmt[pos++].free = TRUE;
+ }
fmt[pos].key = "color";
fmt[pos].val = ewl_text_context_color_string_get(&(ctx->color));
@@ -532,8 +539,11 @@
#define KEY_COMPARE(k1, k2) if (k1 > k2) goto CTX1_LARGER; else if (k2 > k1)
goto CTX2_LARGER;
KEY_COMPARE(ecore_str_compare(tx1->font, tx2->font), 0);
+ KEY_COMPARE(ecore_str_compare(tx1->font_source, tx2->font_source), 0);
KEY_COMPARE(tx1->size, tx2->size);
KEY_COMPARE(tx1->styles, tx2->styles);
+ KEY_COMPARE(tx1->align, tx2->align);
+ KEY_COMPARE(tx1->wrap, tx2->wrap);
KEY_COMPARE(KEY_BUILD(tx1->color), KEY_BUILD(tx2->color));
KEY_COMPARE(KEY_BUILD(tx1->style_colors.bg),
KEY_BUILD(tx2->style_colors.bg));
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
