From: <ada...@us...> - 2003-04-24 17:22:04
|
Update of /cvsroot/contiki/contiki/apps In directory sc8-pr-cvs1:/tmp/cvs-serv31123/apps Modified Files: about.c Log Message: Dialog now resizes itself if the screen is too small Index: about.c =================================================================== RCS file: /cvsroot/contiki/contiki/apps/about.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** about.c 11 Apr 2003 20:10:28 -0000 1.4 --- about.c 24 Apr 2003 17:21:59 -0000 1.5 *************** *** 38,41 **** --- 38,42 ---- #include "ctk.h" + #include "ctk-draw.h" #include "dispatcher.h" *************** *** 71,86 **** LOADER_INIT_FUNC(about_init) { if(id == EK_ID_NONE) { id = dispatcher_start(&p); strcpy(abouturl_ascii, abouturl_petscii); petsciiconv_toascii(abouturl_ascii, sizeof(abouturl_ascii)); ! ! ctk_dialog_new(&aboutdialog, 32, 9); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel1); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel2); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel3); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel4); ! CTK_WIDGET_ADD(&aboutdialog, &abouturl); CTK_WIDGET_ADD(&aboutdialog, &aboutclose); CTK_WIDGET_FOCUS(&aboutdialog, &aboutclose); --- 72,104 ---- LOADER_INIT_FUNC(about_init) { + unsigned char width; + if(id == EK_ID_NONE) { id = dispatcher_start(&p); + + width = ctk_draw_width(); strcpy(abouturl_ascii, abouturl_petscii); petsciiconv_toascii(abouturl_ascii, sizeof(abouturl_ascii)); ! ! if(width > 34) { ! ctk_dialog_new(&aboutdialog, 32, 9); ! } else { ! ctk_dialog_new(&aboutdialog, width - 2, 9); ! } CTK_WIDGET_ADD(&aboutdialog, &aboutlabel1); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel2); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel3); CTK_WIDGET_ADD(&aboutdialog, &aboutlabel4); ! if(width > 34) { ! CTK_WIDGET_ADD(&aboutdialog, &abouturl); ! } else { ! CTK_WIDGET_SET_XPOS(&aboutlabel1, 0); ! CTK_WIDGET_SET_XPOS(&aboutlabel2, 0); ! CTK_WIDGET_SET_XPOS(&aboutlabel3, 0); ! CTK_WIDGET_SET_XPOS(&aboutlabel4, 0); ! ! CTK_WIDGET_SET_XPOS(&aboutclose, 0); ! } CTK_WIDGET_ADD(&aboutdialog, &aboutclose); CTK_WIDGET_FOCUS(&aboutdialog, &aboutclose); |