summaryrefslogtreecommitdiff
path: root/src/widget/widget_label.c
diff options
context:
space:
mode:
authorTomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>2008-10-22 22:51:24 +0200
committerTomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>2008-10-22 22:51:24 +0200
commit44daf03024fbf7cbffa10349044786f6ab784821 (patch)
treefe311eb22e2d853dfc18fde1a9e55d21815f4f82 /src/widget/widget_label.c
parente12753d2ec9db83ec08bb9db63902a82fb245cdd (diff)
Revert "X"
This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd.
Diffstat (limited to 'src/widget/widget_label.c')
-rw-r--r--src/widget/widget_label.c74
1 files changed, 35 insertions, 39 deletions
diff --git a/src/widget/widget_label.c b/src/widget/widget_label.c
index 132a26d..c0b3f35 100644
--- a/src/widget/widget_label.c
+++ b/src/widget/widget_label.c
@@ -8,62 +8,58 @@
#include "widget_label.h"
#include "widget.h"
-widget_t *
-newWidgetLabel(char *text, int x, int y, int bind)
+widget_t* newWidgetLabel(char *text, int x, int y, int bind)
{
- widget_label_t *new;
+ widget_label_t *new;
- new = malloc(sizeof(widget_label_t));
- new->text = strdup(text);
- new->bind = bind;
- getTextSize(text, &(new->w), &(new->h));
+ new = malloc( sizeof(widget_label_t) );
+ new->text = strdup(text);
+ new->bind = bind;
+ getTextSize(text, &(new->w), &(new->h));
- return newWidget(WIDGET_TYPE_LABEL, x, y, new->w, new->h, new);
+ return newWidget(WIDGET_TYPE_LABEL, x, y, new->w, new->h, new);
}
-void
-drawWidgetLabel(widget_t * widget)
+void drawWidgetLabel(widget_t *widget)
{
- widget_label_t *p;
+ widget_label_t *p;
- assert(widget != NULL);
- assert(widget->type == WIDGET_TYPE_LABEL);
+ assert( widget != NULL );
+ assert( widget->type == WIDGET_TYPE_LABEL );
- p = (widget_label_t *) widget->private_data;
+ p = (widget_label_t *) widget->private_data;
- switch (p->bind) {
- case WIDGET_LABEL_RIGHT:
- drawFont(p->text, widget->x + p->w, widget->y + p->h / 2, COLOR_WHITE);
- break;
- case WIDGET_LABEL_LEFT:
- drawFont(p->text, widget->x, widget->y + widget->h / 2, COLOR_WHITE);
- break;
- case WIDGET_LABEL_CENTER:
- drawFont(p->text, widget->x - p->w / 2, widget->y + p->h / 2,
- COLOR_WHITE);
- break;
- }
+ switch( p->bind )
+ {
+ case WIDGET_LABEL_RIGHT :
+ drawFont(p->text, widget->x+p->w, widget->y + p->h/2, COLOR_WHITE);
+ break;
+ case WIDGET_LABEL_LEFT :
+ drawFont(p->text, widget->x, widget->y + widget->h/2, COLOR_WHITE);
+ break;
+ case WIDGET_LABEL_CENTER :
+ drawFont(p->text, widget->x-p->w/2, widget->y + p->h/2, COLOR_WHITE);
+ break;
+ }
}
-void
-eventWidgetLabel(widget_t * widget)
+void eventWidgetLabel(widget_t *widget)
{
- assert(widget != NULL);
- assert(widget->type == WIDGET_TYPE_LABEL);
+ assert( widget != NULL );
+ assert( widget->type == WIDGET_TYPE_LABEL );
}
-void
-destroyWidgetLabel(widget_t * widget)
+void destroyWidgetLabel(widget_t *widget)
{
- widget_label_t *p;
+ widget_label_t *p;
- assert(widget != NULL);
- assert(widget->type == WIDGET_TYPE_LABEL);
+ assert( widget != NULL );
+ assert( widget->type == WIDGET_TYPE_LABEL );
- p = (widget_label_t *) widget->private_data;
+ p = (widget_label_t *) widget->private_data;
- free(p->text);
- free(p);
+ free(p->text);
+ free(p);
- destroyWidget(widget);
+ destroyWidget(widget);
}