More CWFs

diff --git a/tbboxx.cc b/tbboxx.cc
index 4ecd3240ef9b5d4d535a6ac8e84d5dc689db4762..8e7922fa214dfdf806e8887d089cbe3eafc13a8f 100644 (file)
--- a/tbboxx.cc
+++ b/tbboxx.cc
@@ -63,7 +63,7 @@ void TBBoxx::draw()
     int xpos = 5;
 #ifdef GRADIENT_DRAWING
     if (icon) {
-       drawTVMedia(*icon, xpos,0,30,30,TopLeftLimited);
+       drawTVMedia(*icon, static_cast<float>(xpos), 0,30,30,TopLeftLimited);
        xpos+=5+30;
     }
 #endif

diff --git a/vopts.cc b/vopts.cc
index 8a96f73b623ab45ed9885947769c8c5b61d0e199..ca8c3b42bdee7e214503953246c5523dac5b61d2 100644 (file)
--- a/vopts.cc
+++ b/vopts.cc
@@ -504,7 +504,7 @@ void VOpts::processMessage(Message* m)
     {
       BoxStack::getInstance()->update(this);
     } 
-    else if (x<0 || y <0 || x>(int)getWidth() || y>(int)getHeight())
+    else if (coordsOutsideBox(m))
     {
       BoxStack::getInstance()->handleCommand(Input::BACK); //simulate cancel press
     }

diff --git a/vradiorec.cc b/vradiorec.cc
index fc5466216fdd7180a8c8c2f27cf71c11aa37f1f8..673ea77bfd414913f5e749c18ed88538d9e14022 100644 (file)
--- a/vradiorec.cc
+++ b/vradiorec.cc
@@ -274,8 +274,8 @@ void VRadioRec::processMessage(Message* m)
 {
   if (m->message == Message::MOUSE_LBDOWN)
   {
-    int x = m->parameter - (int)getScreenX();
-    int y = m->tag - (int)getScreenY();
+    int x = m->parameter - getScreenX();
+    int y = m->tag - getScreenY();
     if (!barShowing)
     {
       boxstack->handleCommand(Input::OK); //simulate rok press

diff --git a/vrecording.cc b/vrecording.cc
index 3ae8b984a5df22b0d9cf119390b0ab89f40bf0ee..c9936a7869a2a8a9ad15f1261b9cd441b17145d1 100644 (file)
--- a/vrecording.cc
+++ b/vrecording.cc
@@ -173,9 +173,8 @@ void VRecording::draw()
          }
          if (poster.height) {
                 // float aspect=((float)poster.height)/((float)poster.width)/Osd::getInstance()->getPixelAspect();
-                 drawTVMedia(poster.info,buttonRegion.x,
-                                        tabbar.getY2()-3,
-                                               buttonRegion.w,/*buttonRegion.w*aspect*/0.f,BottomLeft);
+                 drawTVMedia(poster.info, static_cast<float>(buttonRegion.x), static_cast<float>(tabbar.getY2() - 3),
+                                               static_cast<float>(buttonRegion.w), /*buttonRegion.w*aspect*/ 0.f, BottomLeft);
          }
   }