[Libreoffice-commits] core.git: cui/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jan 14 11:10:15 UTC 2019


 cui/source/options/optgdlg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c904345b1f3e02db5ab163f46517fec2b85e539
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jan 14 09:48:43 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jan 14 12:09:53 2019 +0100

    Resolves: tdf#122701 opengl settings don't affect gtk3
    
    Change-Id: Iffcf9b6ea8d191a509c2ca451f2ce4a249fde922
    Reviewed-on: https://gerrit.libreoffice.org/66285
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9fa7ce06d79b..80cb1cb442a7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -526,7 +526,7 @@ CanvasSettings::CanvasSettings() :
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
 #if HAVE_FEATURE_OPENGL
-    if( OpenGLWrapper::isVCLOpenGLEnabled() )
+    if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() != "gtk3")
         mbHWAccelAvailable = false;
 
     else


More information about the Libreoffice-commits mailing list