[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source

[Libreoffice Gerrit user]

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

New commits:
commit 390ad702841fd247061377c044df446a7b2c587d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jan 14 09:48:43 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jan 16 02:08:37 2019 +0100

    Resolves: tdf#122701 opengl settings don't affect gtk3
    
    Change-Id: Iffcf9b6ea8d191a509c2ca451f2ce4a249fde922
    Reviewed-on: https://gerrit.libreoffice.org/66292
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit aa15463a2f303ab75679eefa4d8241f2b700684e)
    Reviewed-on: https://gerrit.libreoffice.org/66389
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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