Ticket #12311: 0212-ticket12311-v2.patch

File 0212-ticket12311-v2.patch, 2.3 KB (added by warpme@…, 3 years ago)

Patch for current master

  • mythtv/libs/libmythtv/tv_play.cpp

    diff -Naur mythtv-master-20160505-ged7473f-old/mythtv/libs/libmythtv/tv_play.cpp mythtv-master-20160505-ged7473f-new/mythtv/libs/libmythtv/tv_play.cpp
    old new  
    12741274        {
    12751275            int xbase, width, ybase, height;
    12761276            GetMythUI()->GetScreenBounds(xbase, ybase, width, height);
     1277
     1278            // Hack for ticket12311
     1279            xbase = xbase - 1;
     1280            ybase = ybase - 1;
     1281
    12771282            player_bounds = QRect(xbase, ybase, width, height);
    12781283        }
    12791284
     
    12941299                // big in fullscreen mode
    12951300                if (fullscreen)
    12961301                {
     1302                    // Hack for ticket12311
     1303                    if ((maxHeight >= 1072) && (maxHeight <= 1200))
     1304                    {
     1305                        LOG(VB_GENERAL, LOG_DEBUG, LOC + "Hack for ticket12311: Re-Adjusted Screen size. Original: "
     1306                        + QString("%1x").arg(maxWidth)
     1307                        + QString("%1. New: ").arg(maxHeight)
     1308                        + QString("%1x1080").arg(maxWidth));
     1309                        maxHeight = 1080;
     1310                    }
     1311
    12971312                    player_bounds.setSize(QSize(maxWidth, maxHeight));
    12981313
    12991314                    // resize possibly avoids a bug on some systems
  • mythtv/libs/libmythui/mythuihelper.cpp

    diff -Naur mythtv-master-20160505-ged7473f-old/mythtv/libs/libmythui/mythuihelper.cpp mythtv-master-20160505-ged7473f-new/mythtv/libs/libmythui/mythuihelper.cpp
    old new  
    318318        GetMythDB()->OverrideSettingForSession("GuiHeight", QString::number(h_override));
    319319    }
    320320
    321     m_screenxbase  = GetMythDB()->GetNumSetting("GuiOffsetX");
    322     m_screenybase  = GetMythDB()->GetNumSetting("GuiOffsetY");
     321    m_screenxbase  = GetMythDB()->GetNumSetting("GuiOffsetX") - 1;
     322    m_screenybase  = GetMythDB()->GetNumSetting("GuiOffsetY") - 1;
    323323
    324324    m_screenwidth = m_screenheight = 0;
    325325    GetMythDB()->GetResolutionSetting("Gui", m_screenwidth, m_screenheight);