[Libreoffice-commits] core.git: vcl/unx

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Sun Jul 14 15:50:22 UTC 2019


 vcl/unx/gtk/salnativewidgets-gtk.cxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit c3fb5b99704ef6dd0148aee96695b55044e77946
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jul 12 16:07:29 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sun Jul 14 17:49:30 2019 +0200

    Gtk remove the QtEngineStyle workaround
    
    The detection code for KDE is long gone, so this code will never
    be called.
    
    Change-Id: I2ceff5f184ca6149f0625c9588b5dc876d418503
    Reviewed-on: https://gerrit.libreoffice.org/75498
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 948dd2bdb989..eb2f59457575 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -515,18 +515,6 @@ void GtkSalData::initNWF()
     pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
     pSVData->maNWFData.mnMenuSeparatorBorderX = separator_padding;
 
-    if( SalGetDesktopEnvironment() == "KDE" )
-    {
-        // #i97196# ensure a widget exists and the style engine was loaded
-        NWEnsureGTKButton( SalX11Screen( 0 ) );
-        if( g_type_from_name( "QtEngineStyle" ) )
-        {
-            // KDE 3.3 invented a bug in the qt<->gtk theme engine
-            // that makes direct rendering impossible: they totally
-            // ignore the clip rectangle passed to the paint methods
-            GtkSalGraphics::bNeedPixmapPaint = true;
-        }
-    }
     static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
     if( pEnv && *pEnv )
         GtkSalGraphics::bNeedPixmapPaint = true;


More information about the Libreoffice-commits mailing list