summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-06-05 11:42:08 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-06-05 11:42:08 +0200
commit00645daa93f8b26de7b6a71ea425ef406bdf55d6 (patch)
treeb81b506325bf21e5eb42b41c62d74a54b3457f9b
parent2a5a55cee77c35c437e9f92cbc012e4ffe223dd3 (diff)
downloadvdr-00645daa93f8b26de7b6a71ea425ef406bdf55d6.tar.gz
vdr-00645daa93f8b26de7b6a71ea425ef406bdf55d6.tar.bz2
Implemented drawing "transparent" texts
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--osd.c8
-rw-r--r--osd.h8
4 files changed, 14 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bb7d68fd..78826e5d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -715,6 +715,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
bitmap area is covered
for reporting a bug in cBitmap::DrawPixel(), which messed with other bitmaps'
palettes in case the pixel coordinates were outside this bitmap
+ for suggesting to allow drawing "transparent" texts
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index 87e91ce9..b62a7fb6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2876,3 +2876,6 @@ Video Disk Recorder Revision History
- Fixed cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case
the pixel coordinates were outside this bitmap (thanks to Sascha Volkenandt for
reporting this one).
+- The cBitmap::DrawText() function now doesn't set any background pixels if the
+ given background color is clrTransparent. This allows drawing "transparent"
+ texts (suggested by Sascha Volkenandt).
diff --git a/osd.c b/osd.c
index 7feee784..b61bfbd9 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.49 2004/06/05 11:15:43 kls Exp $
+ * $Id: osd.c 1.50 2004/06/05 11:37:42 kls Exp $
*/
#include "osd.h"
@@ -355,7 +355,8 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
int ch = Height ? Height : h;
if (!Intersects(x, y, x + cw - 1, y + ch - 1))
return;
- DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
+ if (ColorBg != clrTransparent)
+ DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
limit = x + cw - x0;
if (Width) {
if ((Alignment & taLeft) != 0)
@@ -396,7 +397,8 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
for (int row = 0; row < h; row++) {
cFont::tPixelData PixelData = CharData->lines[row];
for (int col = CharData->width; col-- > 0; ) {
- SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
+ if (ColorBg != clrTransparent || (PixelData & 1))
+ SetIndex(x + col, y + row, (PixelData & 1) ? fg : bg);
PixelData >>= 1;
}
}
diff --git a/osd.h b/osd.h
index de0db694..1fc87819 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.h 1.43 2004/05/31 14:09:00 kls Exp $
+ * $Id: osd.h 1.44 2004/06/05 11:40:12 kls Exp $
*/
#ifndef __OSD_H
@@ -158,7 +158,8 @@ public:
///< Draws the given string at coordinates (x, y) with the given foreground
///< and background color and font. If Width and Height are given, the text
///< will be drawn into a rectangle with the given size and the given
- ///< Alignment (default is top-left).
+ ///< Alignment (default is top-left). If ColorBg is clrTransparent, no
+ ///< background pixels will be drawn, which allows drawing "transparent" text.
void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
///< (x2, y2) corners with the given Color. If the rectangle covers the entire
@@ -276,7 +277,8 @@ public:
///< Draws the given string at coordinates (x, y) with the given foreground
///< and background color and font. If Width and Height are given, the text
///< will be drawn into a rectangle with the given size and the given
- ///< Alignment (default is top-left).
+ ///< Alignment (default is top-left). If ColorBg is clrTransparent, no
+ ///< background pixels will be drawn, which allows drawing "transparent" text.
virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);
///< Draws a filled rectangle defined by the upper left (x1, y1) and lower right
///< (x2, y2) corners with the given Color.