[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Caolán McNamara]

 vcl/source/window/window.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 18d6d789cae7cd684156dbd41d473892bc17392c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 30 20:51:29 2015 +0100

    gtk3: bizarro macosx default text area height calc infected gtk3
    
    mbNoFocusRects is also the case now for gtk3, but this unfortunate
    heuristic makes the database and chart wizards and various other
    things just way too tall. This is likely a desperate effort to
    make pre layout dialogs size to something sensible
    
    Change-Id: I501f04ad96063935dd1f162e009ffd5053a820c4
    (cherry picked from commit 93b615d220d3f12e314920dc8b18c8ae8fc23c94)

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 58463b5..757b2d1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1191,6 +1191,7 @@ void Window::ImplInitAppFontData( vcl::Window* pWindow )
     pSVData->maGDIData.mnAppFontX = nTextWidth * 10 / 8;
     pSVData->maGDIData.mnAppFontY = nTextHeight * 10;
 
+#ifdef MACOSX
     // FIXME: this is currently only on OS X, check with other
     // platforms
     if( pSVData->maNWFData.mbNoFocusRects )
@@ -1212,6 +1213,7 @@ void Window::ImplInitAppFontData( vcl::Window* pWindow )
                 pSVData->maGDIData.mnAppFontY = (aContentRgn.GetHeight()-4) * 10;
         }
     }
+#endif
 
     pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX;
     if ( pSVData->maAppData.mnDialogScaleX )