diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-30 20:51:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-30 20:56:25 +0100 |
| commit | 18d6d789cae7cd684156dbd41d473892bc17392c (patch) | |
| tree | 499655d1c1294778c2038fe92c3bb6125260a0e7 /vcl | |
| parent | 853cca09070ea8fc684fc3ebef40df2e3864318c (diff) | |
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)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 58463b57c0d7..757b2d154c65 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 ) |