summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-30 20:51:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-30 20:52:04 +0100
commit93b615d220d3f12e314920dc8b18c8ae8fc23c94 (patch)
tree0644e1b1be9bb65e9a99a6030ebb4654fa71efbb
parentab23efcc2bb9ca178dee16b3d01eabb3f80d8e17 (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
-rw-r--r--vcl/source/window/window.cxx2
1 files changed, 2 insertions, 0 deletions
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 )