Changeset 845

Timestamp:

10/03/07 07:12:11 (14 months ago)

Author:

michael

Message:

automatic marquee patch from Manuel Grot

Location:

trunk

Files:

• widget_text.c (modified) (5 diffs)
• widget_text.h (modified) (2 diffs)

trunk/widget_text.c

@@ -86 +86 @@
       pad = 0;
   break;
+    case ALIGN_AUTOMATIC:
+  if (len <= width) {
+      pad = 0;
+      break;
+  }
     case ALIGN_MARQUEE:
   pad = width - T->scroll;
@@ -220 +225 @@
   /* update callback timer, so we do nothing here; otherwise */
   /* we simply call this scroll callback directly */
-  if (T->align != ALIGN_MARQUEE) {
+  if (T->align != ALIGN_MARQUEE || T->align != ALIGN_AUTOMATIC) {
       widget_text_scroll(Self);
   }
@@ -280 +285 @@
   Text->align = ALIGN_MARQUEE;
   break;
+    case 'A':
+  Text->align = ALIGN_AUTOMATIC;
+  break;
     default:
   error("widget %s has unknown alignment '%s', using 'Left'", section, c);
@@ -293 +301 @@
 
     /* marquee scroller speed: interval (msec), default 500msec */
-    if (Text->align == ALIGN_MARQUEE) {
+    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC) {
   cfg_number(section, "speed", 500, 10, -1, &(Text->speed));
     }
@@ -307 +315 @@
 
     /* a marquee scroller has its own timer and callback */
-    if (Text->align == ALIGN_MARQUEE) {
+    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC) {
   timer_add(widget_text_scroll, Self, Text->speed, 0);
     }

trunk/widget_text.h

@@ -31 +31 @@
 #include "property.h"
 
-typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE } TEXT_ALIGN;
+typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE, ALIGN_AUTOMATIC } TEXT_ALIGN;
 
 typedef struct WIDGET_TEXT {
@@ -42 +42 @@
     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) */
+    TEXT_ALIGN align;   /* alignment: L(eft), C(enter), R(ight), M(arquee), A(utomatic) */
     int update;     /* update interval */
     int scroll;     /* marquee starting point */