Ticket #13243: themepainter.patch

File themepainter.patch, 2.6 KB (added by gigem, 6 years ago)

  • mythtv/libs/libmythui/mythmainwindow.cpp 

    diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index d59960c2a2..1a60f0b9fb 100644
    a b void MythMainWindow::Init(QString forcedpainter, bool mayReInit) 
    11221122    }
    11231123
    11241124    QString painter = forcedpainter.isEmpty() ?
    1125         GetMythDB()->GetSetting("ThemePainter", QT_PAINTER) : forcedpainter;
     1125        GetMythDB()->GetSetting("ThemePainter", AUTO_PAINTER) : forcedpainter;
    11261126#ifdef _WIN32
    11271127    if (painter == AUTO_PAINTER || painter == D3D9_PAINTER)
    11281128    {
    … … void MythMainWindow::Init(QString forcedpainter, bool mayReInit) 
    11521152    }
    11531153    else
    11541154# endif
    1155     if (
    1156 #ifdef USE_OPENGL_QT5
    1157         // The Qt5 OpenGL painter doesn't render all screens correctly (yet)
    1158         // so only use OpenGL if explicitly requested
    1159 #else
    1160         (painter == AUTO_PAINTER && (!d->painter && !d->paintwin)) ||
    1161 #endif
    1162         painter.contains(OPENGL_PAINTER))
     1155    if ((!d->painter && !d->paintwin) &&
     1156        (painter == AUTO_PAINTER || painter.contains(OPENGL_PAINTER)))
    11631157    {
    11641158        MythRenderOpenGL *gl = MythRenderOpenGL::Create(painter);
    11651159        d->render = gl;

  • mythtv/programs/mythfrontend/globalsettings.cpp 

    diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 0bb2bf81bc..83f8729e01 100644
    a b static HostComboBoxSetting *ThemePainter() 
    26382638
    26392639    gc->setLabel(AppearanceSettings::tr("Paint engine"));
    26402640
    2641     gc->addSelection(QCoreApplication::translate("(Common)", "Qt"), QT_PAINTER);
    26422641    gc->addSelection(QCoreApplication::translate("(Common)", "Auto", "Automatic"),
    26432642                     AUTO_PAINTER);
     2643#ifdef _WIN32
     2644    gc->addSelection(QCoreApplication::translate("(Common)", "Direct3D"),
     2645                     D3D9_PAINTER);
     2646#endif
    26442647#if defined USING_OPENGL && ! defined USING_OPENGLES
    26452648    gc->addSelection(QCoreApplication::translate("(Common)", "OpenGL 2"),
    26462649                     OPENGL2_PAINTER);
    26472650    gc->addSelection(QCoreApplication::translate("(Common)", "OpenGL 1"),
    26482651                     OPENGL_PAINTER);
    26492652#endif
    2650 #ifdef _WIN32
    2651     gc->addSelection(QCoreApplication::translate("(Common)", "Direct3D"),
    2652                      D3D9_PAINTER);
    2653 #endif
     2653    gc->addSelection(QCoreApplication::translate("(Common)", "Qt"), QT_PAINTER);
    26542654    gc->setHelpText(
    26552655        AppearanceSettings::tr("This selects what MythTV uses to draw. "
    26562656                               "Choosing '%1' is recommended, unless running "