diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 11:00:37 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 11:13:05 +0100 |
| commit | 5f0db2c24c466e3c4cf0dc8faba1c62b38c770fd (patch) | |
| tree | 1fe717221f8c9bf9e3cd112b6e765b4f528f4bd6 | |
| parent | 464f19536c2864a911f089d2988be2c3c3ce79b6 (diff) | |
do not claim in titlebar test that OpenGL is enabled if it's not
Skia takes precedence, if enabled. And I'm not going to add Skia text
to the titlebar, it'd need to include whether it's raster or vulkan,
which would be longer, and I don't see why this information needs
to be in the titlebar in the first place (or if it needs, then
it should be consistent and include also gtk3, qt5, etc.).
Change-Id: I9b95c1a986a38293ee65ee49d1a1970c75b3d202
| -rw-r--r-- | framework/source/fwe/helper/titlehelper.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 5b938b5ce465..fba89ae42bfc 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -38,6 +38,7 @@ #include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <vcl/opengl/OpenGLWrapper.hxx> +#include <vcl/skia/SkiaHelper.hxx> #include <vcl/svapp.hxx> @@ -600,7 +601,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) sTitle.append(" ["); sTitle.append(sVersion); #if HAVE_FEATURE_UI - if (OpenGLWrapper::isVCLOpenGLEnabled()) + if (OpenGLWrapper::isVCLOpenGLEnabled() && !SkiaHelper::isVCLSkiaEnabled()) sTitle.append("-GL"); #endif sTitle.append("]"); |