From e5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 19 Aug 2007 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.5.8=20-=20Added=20missing=20install-i18n=20?=
 =?UTF-8?q?to=20the=20install=20target=20in=20the=20Makefile=20(reported?=
 =?UTF-8?q?=20=20=20by=20Joachim=20Wilke).=20-=20Fixed=20a=20faulty=20comm?=
 =?UTF-8?q?ent=20in=20Make.config.template=20(reported=20by=20Marco=20Schl?=
 =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20Improved=20i18n-to-gettext.pl=20(thanks?=
 =?UTF-8?q?=20to=20Matthias=20Schwarzott).=20-=20Moved=20the=20"all"=20tar?=
 =?UTF-8?q?get=20in=20plugin=20Makefiles=20before=20the=20"Implicit=20rule?=
 =?UTF-8?q?s",=20=20=20so=20that=20a=20plain=20"make"=20will=20compile=20e?=
 =?UTF-8?q?verything=20(suggested=20by=20Matthias=20=20=20Schwarzott).=20T?=
 =?UTF-8?q?he=20"newplugin"=20script=20has=20been=20changed=20accordingly.?=
 =?UTF-8?q?=20=20=20Plugin=20authors=20may=20want=20to=20change=20their=20?=
 =?UTF-8?q?Makefiles,=20too.=20-=20Added=20DESTDIR=20and=20PREFIX=20handli?=
 =?UTF-8?q?ng=20to=20the=20Makefile=20(thanks=20to=20Matthias=20=20=20Schw?=
 =?UTF-8?q?arzott).=20-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Rolf=20Ahrenberg).=20-=20Added=20internationalization?=
 =?UTF-8?q?=20to=20the=20"skincurses"=20plugin=20(thanks=20to=20Rolf=20=20?=
 =?UTF-8?q?=20Ahrenberg).=20-=20Checking=20the=20string=20for=20NULL=20in?=
 =?UTF-8?q?=20I18nTranslate().=20-=20Updated=20the=20French=20OSD=20texts?=
 =?UTF-8?q?=20(thanks=20to=20Bruno=20Roussel).=20-=20Some=20optimizations?=
 =?UTF-8?q?=20in=20cDvbDevice::SetChannelDevice()=20(thanks=20to=20Tobias?=
 =?UTF-8?q?=20Bratfisch).=20-=20Optimized=20cMenuEditChrItem::Set()=20(tha?=
 =?UTF-8?q?nks=20to=20Tobias=20Bratfisch).=20-=20Optimized=20cNitFilter::P?=
 =?UTF-8?q?rocess()=20(thanks=20to=20Tobias=20Bratfisch).=20-=20Reduced=20?=
 =?UTF-8?q?the=20number=20of=20time(NULL)=20calls=20in=20vdr.c's=20main=20?=
 =?UTF-8?q?loop=20to=20a=20single=20call=20=20=20(thanks=20to=20Tobias=20B?=
 =?UTF-8?q?ratfisch).=20-=20Changed=20cBitmap::DrawText()=20to=20always=20?=
 =?UTF-8?q?draw=20the=20background=20unless=20ColorBg=20=20=20is=20clrTran?=
 =?UTF-8?q?sparent=20(thanks=20to=20Christoph=20Haubrich).=20-=20The=20"Se?=
 =?UTF-8?q?tup/OSD/Language"=20menu=20now=20only=20shows=20those=20languag?=
 =?UTF-8?q?es=20that=20actually=20=20=20have=20a=20locale=20(suggested=20b?=
 =?UTF-8?q?y=20Anssi=20Hannula).=20-=20Now=20using=20setenv()=20instead=20?=
 =?UTF-8?q?of=20setlocale()=20to=20set=20the=20language=20for=20gettext()?=
 =?UTF-8?q?=20=20=20(suggested=20by=20Anssi=20Hannula;=20thanks=20also=20t?=
 =?UTF-8?q?o=20Ludwig=20Nussel=20for=20a=20hint=20on=20using=20=20=20=5Fnl?=
 =?UTF-8?q?=5Fmsg=5Fcat=5Fcntr).=20-=20When=20scanning=20the=20locale=20di?=
 =?UTF-8?q?rectory,=20VDR=20now=20explicitly=20looks=20for=20a=20file=20na?=
 =?UTF-8?q?med=20=20=20vdr.mo.=20Text=20files=20for=20plugins=20are=20now?=
 =?UTF-8?q?=20named=20"vdr-name.mo",=20when=20"name"=20is=20the=20=20=20na?=
 =?UTF-8?q?me=20of=20the=20plugin.=20The=20"newplugin"=20script=20has=20be?=
 =?UTF-8?q?en=20changed=20accordingly,=20and=20=20=20plugin=20authors=20sh?=
 =?UTF-8?q?ould=20change=20their=20Makefiles,=20too.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 osd.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'osd.c')

diff --git a/osd.c b/osd.c
index 3be8fc7..5624c26 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.72 2007/08/12 11:33:17 kls Exp $
+ * $Id: osd.c 1.73 2007/08/17 15:23:50 kls Exp $
  */
 
 #include "osd.h"
@@ -449,13 +449,13 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
      int w = Font->Width(s);
      int h = Font->Height();
      int limit = 0;
+     int cw = Width ? Width : w;
+     int ch = Height ? Height : h;
+     if (!Intersects(x, y, x + cw - 1, y + ch - 1))
+        return;
+     if (ColorBg != clrTransparent)
+        DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
      if (Width || Height) {
-        int cw = Width ? Width : w;
-        int ch = Height ? Height : h;
-        if (!Intersects(x, y, x + cw - 1, y + ch - 1))
-           return;
-        if (ColorBg != clrTransparent)
-           DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
         limit = x + cw - x0;
         if (Width) {
            if ((Alignment & taLeft) != 0)
@@ -482,8 +482,6 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
               }
            }
         }
-     else if (!Intersects(x, y, x + w - 1, y + h - 1))
-        return;
      x -= x0;
      y -= y0;
      Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
-- 
cgit v1.2.3