[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gtksalframe.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 8fdf126e4b8c49093cd33f921b675d40fe98eafe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 19 15:40:50 2018 +0000

    Resolves: tdf#115106 don't assume fullscreen is impress
    
    writer can too, so revert this part of
    
    commit 277395b6266c57a7709c3c47986f135f6789c8e7
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Tue Jun 13 18:09:08 2017 +0100
    
        make opengl transitions under X flicker free on enter/leave
    
    which should restore matters to its former glory, at this point gtk3 opengl
    transition support now works so it all moot to me now.
    
    Change-Id: I78a8a774aead6482d0541575dbf10ad977ceccc0
    Reviewed-on: https://gerrit.libreoffice.org/48208
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index c0bbf1303b1a..ff540dc8fd1d 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2868,9 +2868,7 @@ gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer
 {
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
 
-    const bool bImmediate = OpenGLHelper::isVCLOpenGLEnabled() || pThis->m_bFullscreen;
-
-    struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y, pEvent->area.width, pEvent->area.height, bImmediate );
+    struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y, pEvent->area.width, pEvent->area.height, OpenGLHelper::isVCLOpenGLEnabled() );
 
     pThis->CallCallback( SalEvent::Paint, &aEvent );