From 19a2c77557a8cb26c12a8822b0278c39c9bd3fec Mon Sep 17 00:00:00 2001 From: reinelt <> Date: Sun, 6 Nov 2005 09:54:43 +0000 Subject: [lcd4linux @ 2005-11-06 09:54:43 by reinelt] fixed icon size removed, uses XRES & YRES (I hope this doesn't lead to problemes...) --- drv_generic_text.c | 12 +++++++----- widget_icon.c | 9 ++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drv_generic_text.c b/drv_generic_text.c index 79a89ff..bc18d74 100644 --- a/drv_generic_text.c +++ b/drv_generic_text.c @@ -1,4 +1,4 @@ -/* $Id: drv_generic_text.c,v 1.28 2005/08/22 05:44:43 reinelt Exp $ +/* $Id: drv_generic_text.c,v 1.29 2005/11/06 09:54:43 reinelt Exp $ * * generic driver helper for text-based displays * @@ -23,6 +23,9 @@ * * * $Log: drv_generic_text.c,v $ + * Revision 1.29 2005/11/06 09:54:43 reinelt + * fixed icon size removed, uses XRES & YRES (I hope this doesn't lead to problemes...) + * * Revision 1.28 2005/08/22 05:44:43 reinelt * new driver 'WincorNixdorf' * some fixes to the bar code @@ -172,7 +175,7 @@ * renders Text widget into framebuffer * calls drv_generic_text_real_write() * - * int drv_generic_text_icon_init (void); + * int drv_generic_text_icon_init (void); * initializes the generic icon driver * * int drv_generic_text_icon_draw (WIDGET *W); @@ -743,7 +746,7 @@ static void drv_generic_text_bar_create_segments(void) break; /* hollow style, val(1,2) == 1, like '[' */ /* if (l1 == 1 && l2 == 1 && Segment[i].style == STYLE_FIRST && BarFB[n].style == STYLE_HOLLOW) - break; + break; *//* hollow style, val(1,2) == 1, like ']' */ /* if (l1 == 1 && l2 == 1 && Segment[i].style == STYLE_LAST && BarFB[n].style == STYLE_HOLLOW) break; @@ -869,8 +872,7 @@ static void drv_generic_text_bar_pack_segments(void) } #if 0 debug("pack_segment: n=%d i=%d j=%d min=%d", nSegment, pack_i, pack_j, min); - debug("Pack_segment: i1=%d i2=%d j1=%d j2=%d\n", - Segment[pack_i].val1, Segment[pack_i].val2, Segment[pack_j].val1, Segment[pack_j].val2); + debug("Pack_segment: i1=%d i2=%d j1=%d j2=%d\n", Segment[pack_i].val1, Segment[pack_i].val2, Segment[pack_j].val1, Segment[pack_j].val2); #endif nSegment--; diff --git a/widget_icon.c b/widget_icon.c index 0341689..81a6867 100644 --- a/widget_icon.c +++ b/widget_icon.c @@ -1,4 +1,4 @@ -/* $Id: widget_icon.c,v 1.18 2005/11/06 09:17:20 reinelt Exp $ +/* $Id: widget_icon.c,v 1.19 2005/11/06 09:54:43 reinelt Exp $ * * icon widget handling * @@ -21,6 +21,9 @@ * * * $Log: widget_icon.c,v $ + * Revision 1.19 2005/11/06 09:54:43 reinelt + * fixed icon size removed, uses XRES & YRES (I hope this doesn't lead to problemes...) + * * Revision 1.18 2005/11/06 09:17:20 reinelt * re-use icons (thanks to Jesus de Santos Garcia) * @@ -127,8 +130,8 @@ #include #endif -/* icons always are 8 pixels high */ -#define YRES 8 +/* icons size is same as char size */ +extern int XRES, YRES; static void widget_icon_read_bitmap(const char *section, WIDGET_ICON * Icon) { -- cgit v1.2.3 logsubject'>update scan file for ch-AllChristoph Pfister1-0/+1 submitted by tkernen deckpoint.ch 2010-06-24update scan file for au-BrisbaneChristoph Pfister1-0/+2 submitted by jrnorris gmail.com 2010-06-05update scan file for fr-BoulogneChristoph Pfister1-10/+7 submitted by jean-michel-62 orange.fr 2010-06-01update scan file for de-SachsenChristoph Pfister1-1/+1 2010-06-01update scan files for de-*Christoph Pfister10-32/+32 2010-05-24update scan file for fr-ChamberyChristoph Pfister1-24/+18 submitted by n_estre yahoo.fr 2010-05-23update scan file for fr-NantesChristoph Pfister1-6/+7 submitted by biribi free.fr 2010-05-23update scan file for fr-Lille-BouvignyChristoph Pfister3-43/+26 and remove obsoleted files submitted by romain romain-bajeux.com 2010-05-19update scan file for fr-LavalChristoph Pfister1-6/+6 submitted by hftom free.fr 2010-05-19update scan file for fr-NantesChristoph Pfister1-6/+6 submitted by matpic free.fr 2010-05-16update scan file for de-HamburgChristoph Pfister1-0/+1 submitted by toralf.foerster gmx.de 2010-05-09update scan file for de-UnitymediaChristoph Pfister1-8/+9 2010-05-02update scan file for hr-AllChristoph Pfister1-1/+1 submitted by samuel.rakitnican gmail.com 2010-04-29update scan file for de-PrimacomChristoph Pfister1-0/+5 submitted by robert.wohlrab gmx.de 2010-04-29update scan file for dk-AllChristoph Pfister1-5/+11 submitted by rk.katana.steel gmail.com 2010-04-29update scan file for fi-TurkuChristoph Pfister1-1/+7 submitted by miika vesti.fi 2010-04-29update scan file for uk-AberdareChristoph Pfister1-10/+15 submitted by redtux1 googlemail.com 2010-04-29update scan file for fr-NantesChristoph Pfister1-6/+6 submitted by debotux gmail.com