aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drv_generic_text.c12
-rw-r--r--widget_icon.c9
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 <dmalloc.h>
#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)
{