vcl/source/window/window.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 93b615d220d3f12e314920dc8b18c8ae8fc23c94
Author: Caolán McNamara <[email protected]>
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
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6c221480..316bb0c 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 )
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
