From 9e6804e49cac8d859b899ae49509ffdf347eda7f Mon Sep 17 00:00:00 2001 From: reinelt Date: Sun, 13 Aug 2006 11:38:20 +0000 Subject: [lcd4linux @ 2006-08-13 11:38:20 by reinelt] text widget uses dynamic properties git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@691 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- widget_text.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'widget_text.h') diff --git a/widget_text.h b/widget_text.h index f864410..61e5b35 100644 --- a/widget_text.h +++ b/widget_text.h @@ -1,4 +1,4 @@ -/* $Id: widget_text.h,v 1.8 2006/08/13 09:53:10 reinelt Exp $ +/* $Id: widget_text.h,v 1.9 2006/08/13 11:38:20 reinelt Exp $ * * simple text widget handling * @@ -23,6 +23,9 @@ * * * $Log: widget_text.h,v $ + * Revision 1.9 2006/08/13 11:38:20 reinelt + * text widget uses dynamic properties + * * Revision 1.8 2006/08/13 09:53:10 reinelt * dynamic properties added (used by 'style' of text widget) * @@ -72,20 +75,15 @@ typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE } TEXT_ALIGN; typedef struct WIDGET_TEXT { - char *prefix; /* expression for label on the left side */ - void *pretree; /* pre-compiled expression for label on the left side */ - char *preval; /* value for label on the left side */ - char *postfix; /* expression for label on the right side */ - void *posttree; /* pre-compiled expression for label on the right side */ - char *postval; /* value for label on the right side */ - char *expression; /* expression that delivers the value */ - void *tree; /* pre-compiled expression that delivers the value */ - char *value; /* evaluated value from expression */ + PROPERTY prefix; /* label on the left side */ + PROPERTY postfix; /* label on the right side */ + PROPERTY value; /* value of text widget */ + PROPERTY style; /* text style (plain/bold/slant) */ + char *string; /* formatted value */ char *buffer; /* string with 'width+1' bytes allocated */ int width; /* field width */ int precision; /* number of digits after the decimal point */ TEXT_ALIGN align; /* alignment: L(eft), C(enter), R(ight), M(arquee) */ - PROPERTY style; /* text style (plain/bold/slant) */ int update; /* update interval */ int scroll; /* marquee starting point */ int speed; /* marquee scrolling speed */ -- cgit v1.2.3