From 93b615d220d3f12e314920dc8b18c8ae8fc23c94 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 30 Jun 2015 20:51:29 +0100 Subject: 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 --- vcl/source/window/window.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6c221480c8fb..316bb0c438a1 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1193,6 +1193,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 ) @@ -1214,6 +1215,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 ) -- cgit