strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show Skia UI controls only on Windows for now (tdf#133166)

Browse source 
Windows is now more or less the only platform where Skia gets used.
There's also the 'gen' VCL backend on Linux, but that one gets
used rarely and it's Skia options are still accessible in the expert
configuration.

Change-Id: Ibec9b8b15e9200f003367b4568432ce93ec63893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94708
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák 2020-05-22 20:45:46 +02:00
parent 50d7e02bb7
commit c42550f520
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compilerplugins/clang/staticmethods.cxx
View file

@ -159,6 +159,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
.GlobalNamespace())
|| (fdc.Function("RemoveDdeTopic").Class("SfxApplication")
.GlobalNamespace())
|| (fdc.Function("UpdateSkiaStatus").Class("OfaViewTabPage")
.GlobalNamespace())
|| (fdc.Function("ReleaseData").Class("ScannerManager")
.GlobalNamespace()))
{

13
cui/source/options/optgdlg.cxx
View file

@ -713,6 +713,17 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p
m_xMenuIconBox->hide();
}
#if !HAVE_FEATURE_SKIA || !defined(_WIN32)
// Duplicated also in UpdateSkiaStatus().
// For now Skia is used mainly on Windows, hide the controls everywhere else.
// It can also be used on Linux, but only with the rarely used 'gen' backend.
m_xUseSkia->hide();
m_xForceSkia->hide();
m_xForceSkiaRaster->hide();
m_xSkiaStatusEnabled->hide();
m_xSkiaStatusDisabled->hide();
#endif
m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) );
m_xForceSkia->connect_toggled(LINK(this, OfaViewTabPage, OnForceSkiaToggled));
@ -1107,10 +1118,12 @@ void OfaViewTabPage::UpdateSkiaStatus()
{
if (Application::GetToolkitName() == "gtk3")
return;
#if HAVE_FEATURE_SKIA && defined(_WIN32)
// Easier than a custom translation string.
bool bEnabled = SkiaHelper::isVCLSkiaEnabled();
m_xSkiaStatusEnabled->set_visible(bEnabled);
m_xSkiaStatusDisabled->set_visible(!bEnabled);
#endif
}
struct LanguageConfig_Impl