Ticket #2163: 2163_fix_edit_osd_placement.diff

mythtv/libs/libmythtv/osd.cpp

@@ -2237 +2237 @@
     char name[128];
     sprintf(name, "%lld-%d", number, type);
 
-    int xtmp = (int)((editarrowRect.width() * 1.0 / totalframes) * number);
-    int xpos = (int) round((editarrowRect.left() + xtmp) * wmult);
+    int pos  = number * 1000 / totalframes;
+    int xtmp = (int)(round(editarrowRect.width() * wmult) / 1000.0 * pos);
+    int xpos = xtmp + (int)(editarrowRect.left() * wmult);
     int ypos = (int) round(editarrowRect.top() * hmult);
 
     osdlock.lock();
 
     OSDSet *set = new OSDSet(name, false,
                              osdBounds.width(), osdBounds.height(),
-                             wmult, hmult, frameint);
+                             wmult, hmult, frameint, xoffset, yoffset);
     set->SetAllowFade(false);
     OSDSet *container = GetSet("editmode");
     if (container)
@@ -2257 +2258 @@
 
     OSDTypeImage *image;
     if (type == 0)
-    {
         image = new OSDTypeImage(*editarrowleft);
-        xpos -= image->ImageSize().width();
-    }
     else
-    {
         image = new OSDTypeImage(*editarrowright);
-    }
+
+    // FIXME: image is only after Reinit() correctly scaled
+    image->Reinit(wmult, hmult);
+
+    xpos -= image->ImageSize().width()/2;
 
     image->SetPosition(QPoint(xpos, ypos), wmult, hmult);
 

mythtv/libs/libmythtv/osdtypes.cpp

@@ -19 +19 @@
 /// Shared OSD image cache
 OSDImageCache OSDTypeImage::c_cache;
 
-OSDSet::OSDSet(const QString &name, bool cache, int screenwidth, 
-               int screenheight, float wmult, float hmult, int frint)
+
+OSDSet::OSDSet(const QString &name, bool cache, int screenwidth,
+               int screenheight, float wmult, float hmult,
+               int frint, int xoff, int yoff)
       : QObject()
 {
     m_wantsupdates = false;
@@ -43 +45 @@
     m_screenheight = screenheight;
     m_wmult = wmult;
     m_hmult = hmult;
-    m_xoffsetbase = 0;
-    m_yoffsetbase = 0;
+    m_xoffsetbase = xoff;
+    m_yoffsetbase = yoff;
 
     m_notimeout = false;
     m_fadetime = -1;

mythtv/libs/libmythtv/osdtypes.h

@@ -44 +44 @@
 {
     Q_OBJECT
   public:
-    OSDSet(const QString &name, bool cache, int screenwidth, int screenheight, 
-           float wmult, float hmult, int frint);
+    OSDSet(const QString &name, bool cache, int screenwidth, int screenheight,
+           float wmult, float hmult, int frint, int xoff=0, int yoff=0);
     OSDSet(const OSDSet &other);
    ~OSDSet();